Merge branch 'release/v0.2.4'
Merge branch 'release/v0.3.1'
update Gemfile.lock
Merge branch 'hotfix/gemfile_lock' into develop