pep8 and code cleanup
Merge pull request #6 from paullianyang/master

Merge pull request #5 from paullianyang/develop
Merge pull request #7 from paullianyang/develop

Develop