Preparing to support travis-ci