Adresses issue #11 and refactors code for compliance with pep8
Fixed issue caused by last commit that made nosetests fail
Merge pull request #13 from dmeyer3691/master

Pep8 compliance