Merge pull request #2 from SPAstef/master

We can merge it
Merge pull request #3 from SPAstef/readme_edits

Merge pull request #2 from SPAstef/master