pep8 it up
Merge pull request #45 from ottoyiu/pep8

pep8 it up and change file from dos (oops) to unix