Merge branch 'dev'
travis-ci status img