Updated for Travis to correctly build