Merge pull request #17 from mmattioli/master

Documentation Improvements and PEP8 Compliance
modified todo
Merge pull request #8 from psychomario/master

update from original