Merge pull request #9 from brentthorne/master

Catch up dev to working master