Merge branch 'release/0.12.4' into develop
pep8 compliance
bumbed version number
Merge branch 'release/0.12.5'