Merge branch 'dev'
travis-ci build status for master