Merge pull request #65 from jam231/Issue#18

Issue#18
Merge branch 'master' into Issue#59