Added travis-ci compatibility