pep8
Update docs
Merge branch 'develop'