Merge pull request #3 from julienp/master

Fix merge
Updated docs
Bumped to version 0.2.1