Merge pull request #65 from visible-difference/develop

user changes from develop
Merge pull request #66 from visible-difference/master

Merge pull request #65 from visible-difference/develop