Merge pull request #8 from ashcrow/master

Bug Fix, Pep8 Updates and Notes