matthewhanson Merge pull request #167 from gipit/develop