Merge pull request #12 from psychomario/master

update from original
updated docs
updated docs
Merge pull request #13 from psychomario/master

update from original
Merge pull request #21 from mmattioli/master

Updated Documentation