Merge branch 'hotfix/0.18.2'

* hotfix/0.18.2:
  updated changelog
  * Ruby 2.1.4
Updated gems
Fixed specs to work with webmock 1.20.4
Merge branch 'hotfix/0.18.3' into develop

* hotfix/0.18.3:
  Fixed specs to work with webmock 1.20.4
  Updated gems