Merge pull request #507 from daneden/gulp