Merge pull request #73 from visible-difference/develop

Develop merge into master