Merge branch 'develop'
Conform to pep8
Publish version 1.11.0