Merge branch 'release/addedCaching' into develop

* release/addedCaching:
  bumbed version number
fixed
Merge branch 'develop'

* develop:
  fixed