PEP8
Merge remote branch 'origin/PEP8' into release-candidate
release 0.6.4