PEP8 compliance.
Mark as dev version.
Bump version.
Merge branch 'release/0.4.0'

* release/0.4.0:
  Bump version.
Bump version.