patched up a minor bug
updated the changelog
Merge branch 'hotfix/2.1.1'