Merge branch 'release/0.0.2' into develop
lock file (should this even be here on a gem?)
Merge branch 'master' into develop