Finish Readme

this is a modified version in order to test the branch way of doing :)
Merge pull request #2 from morjane/readme-edits

Readme edits, fixes#1