Merging changes made in 1.1.0 release from SVN.
Fixes #1.