Merge pull request #196 from jlambert121/master

Merge #195