Merge pull request #17 from pursual/master

Rev integration
v0.2.2
Fixed options