Feature/gulp optimizations