Merge pull request #151 from visible-difference/develop

Develop merge into master