fixup! fixup! fixup! fixup! fixup! fixup! Improve travis support?