Merge pull request #10 from brentthorne/dev

Merge pull request #9 from brentthorne/master