Issue #6 fixed along with PEP 8 fixes

:+1: