Merge pull request #20 from mmattioli/master

Documentation Proofreading
#19 implementation error
Merge pull request #12 from psychomario/master

update from original