Merge pull request #27 from praekelt/feature/issue-27-pep8

Please adhere to pep8.