PEP8 Compliance
Merge branch 'master' of github.com:jpulec/Untitled