Bugs are fixed. Version 1.1 is ready for release.
Merge branch 'master' into nikolaj
Files are merged with master version 1.1