fontanon Merge pull request #13 from andalugeeks/hotfix/pep8_issues