fixing travis ci build
Merge branch 'dev'

* dev:
  fixing travis ci build