Committing changes from new fork
Merge pull request #52 from jpeterson7755/master

Committing changes from new fork