Merge pull request #15 from noobur/develop

Fix for Issue #14 and PEP8 changes.
fixes minor formatting issue
Merge pull request #1 from shaunagm/master

Pulling in latest updates for my fork.
Merge branch 'master' into develop2