Merge pull request #24 from marcesher/master

Fix tests; update README