Merge pull request #11 from brentthorne/dev

Dev