update gem and update conditions
Merge branch 'hotfix/update_gem'

* hotfix/update_gem:
  update gem and update conditions
Merge branch 'hotfix/update_gem' into develop

* hotfix/update_gem:
  update gem and update conditions
Merge branch 'release/0.4.3'

* release/0.4.3: