Merge branch 'hotfix/0.2.1'
Update gemspec
Merge branch 'hotfix/0.2.2' into dev