Merge pull request #16 from brentthorne/dev

Dev