Merged changes from SVN release 1.1.0

Fixes #1.