Fixed tests
Fixed travisci build status image
Merge branch 'master' into develop

* master:
  Fixed travisci build status image
  Fixed tests