Merge pull request #13 from glennblock/dev

Merged