Updated to be friendlier to gulp