updated changelog for 1.1.1
copied #431
Add a test
Merge branch '1.1.x'