Merge branch 'release/0.3.1' into develop
Fix travis
Update Pep8
Update version.
Merge branch 'release/0.3.2'