Merge branch 'release/0.2.2' into develop
Add ruby 2.1.0 to travis build
Merge branch 'develop'