This fixes #1 and fixes #2 and fixes #3
Merge branch '1.1'