Adding stream support + Adapting to the last Gulp version