Added stuff for travis-ci