Merge pull request #1 from finger75/develop

My changes
Merge branch 'develop'
Merge remote-tracking branch 'origin/master' into develop