Refactor readme
Merge pull request #569 from eordano/fix/readme

Refactor readme