Merge remote-tracking branch 'origin/master'
add travis-ci badge