Merge pull request #36 from loganmc10/master