Merge pull request #65 from visible-difference/develop

user changes from develop