* Updated gems
* Improved code
Merge branch 'hotfix/0.13.6'

* hotfix/0.13.6:
  * Updated gems * Improved code