Merge pull request #1 from orofarne/master

Refactor test suite
Update README.md