Feat/gulp file

combined with prev pull request