fixed lots of stuff
fixed lots of PEP8
Merge pull request #2 from shezi/master

fixed lots of stuff