Merge pull request #151 from visible-difference/develop

Develop merge into master
Merge pull request #152 from visible-difference/master

Merge pull request #151 from visible-difference/develop