Merge pull request #197 from weese/develop

Merged master into develop to sync them