Merge pull request #1 from subtub/develop

v1.1.0 merge develop into master
Update CHANGELOG.md
Merge pull request #2 from subtub/master

update develop branch from master