Merge branch 'master' into dev
Adding dev to travis status