Prepared for adding to travis