* trying to get travis CI working
Merge remote branch 'origin/master'