Merge branch 'release/0.3.0'
Updated gems
fixed conflicts