#54 - Prepared for release 1.0.7
Merge branch 'release-1.0.7'
Merge branch 'master' into dev