Merge pull request #23 from mattmakesmaps/master

Merge master into development.