Merge pull request #119 from thomthom/master

Final fixes and preparations for version 2.1 release.