Merge

Created originally on Bitbucket by Anonymous

Was already merged in Bitbucket before import, marked as merged by the import user

Adding pep8 review