Bugfixes and refactoring
Updated readme
Prepared Release
Merge branch 'release/1.0.61'

Conflicts:
	README.md