Should now pass Travis CI