Merge branch 'hotfix/Fix_readme'
Merge branch 'release/1.1.0'
Bump version number.
Make documentation match behaviour.
Merge branch 'hotfix/fix-documentation' into develop

Conflicts:
	pom.xml