Updated with new version
Merge branch 'master' into develop

* master:
  Updated with new version