Work on #36
Implements #37, #36, #34
Update README
Merge pull request #38 from emmanuel-keller/master

Prepare v1.1