Merge pull request #73 from visible-difference/develop

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

Merge pull request #73 from visible-difference/develop