Merge pull request #23 from mattmakesmaps/master

Merge master into development.
Merge pull request #24 from mattmakesmaps/development

Merge pull request #23 from mattmakesmaps/master