Resolve #179, pep8 fixes
Remove PEP8 fixes
Merge pull request #183 from saketkc/issue_179

Resolve #179, pep8 fixes