Fixes #188
Merge branch 'develop' into addpep8
Merge pull request #189 from rajat974/addpep8

Fixes #188