Gulp

#299 resubmitted again develop to make it easier to read the diff