Merge in pep8 test case
Merge branch 'add-pep8-test-case'
Bumped version
Merge branch 'bump-version'