Updates configuration
Merge branch 'master' into develop

* master:
  travis master branch in Readme.md
Merge branch 'release/1.0.1'

* release/1.0.1:
  Updates configuration