Last commit before release 1.1.0
Merge branch 'release_1.0.0'