Updating with jhass's code change. Still looking into Travis failure...