Made code pep8 compliant
Merge branch 'develop'