pep8
Use slightly more terse names.
0.4.0
Merge branch 'release/0.4.0' into develop