Drosty/truegm — pull request #36 by Drosty (2014-08-08 21:21:55+00:00)
Title: Merge Develop into Master

merge things into master