complete rewrite
release 1.1
Merge branch 'release/1.1'