Release 1.1: bug fixes
Merge version number bump from master branch