PEP8 followed; unused file removed
PEP8 adhered to
Merged changes from upstream
Merge pull request #92 from khandelwal/master

PEP8