Merge branch 'release/0.3.6' into develop
removed if statement from Gemfile
bump da version
Merge branch 'release/0.3.7'