Merge pull request #2 from michaelhousman/master

Title
Merge pull request #3 from michaelhousman/dev

Merge pull request #2 from michaelhousman/master