Merge pull request #66 from brentthorne/dev

Dev