Merge pull request #9 from alexcp/master

Removing duplication + a lot of changes
Update README.md