diff --git a/gulpfile.js b/gulpfile.js
index 0271ea92..1fda4a69 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,6 +1,8 @@
 'use strict';
 
 var gulp = require('gulp');
+var browserSync = require('browser-sync');
+var reload = browserSync.reload;
 
 // load plugins
 var $ = require('gulp-load-plugins')();
@@ -12,6 +14,7 @@ gulp.task('styles', function () {
         }))
         .pipe($.autoprefixer('last 1 version'))
         .pipe(gulp.dest('.tmp/styles'))
+        .pipe(reload({stream: true}))
         .pipe($.size());
 });
 
@@ -19,6 +22,7 @@ gulp.task('scripts', function () {
     return gulp.src('app/scripts/**/*.js')
         .pipe($.jshint())
         .pipe($.jshint.reporter($.jshintStylish))
+        .pipe(reload({stream: true, once: true}))
         .pipe($.size());
 });
 
@@ -48,6 +52,7 @@ gulp.task('images', function () {
             interlaced: true
         })))
         .pipe(gulp.dest('dist/images'))
+        .pipe(reload({stream: true, once: true}))
         .pipe($.size());
 });
 
@@ -69,40 +74,27 @@ gulp.task('default', ['clean'], function () {
     gulp.start('build');
 });
 
-gulp.task('connect', function () {
-    var connect = require('connect');
-    var app = connect()
-        .use(require('connect-livereload')({ port: 35729 }))
-        .use(connect.static('app'))
-        .use(connect.static('.tmp'))
-        .use(connect.directory('app'));
-
-    require('http').createServer(app)
-        .listen(9000)
-        .on('listening', function () {
-            console.log('Started connect web server on http://localhost:9000');
-        });
-});
-
-gulp.task('serve', ['connect', 'styles'], function () {
-    require('opn')('http://localhost:9000');
-});
-
-gulp.task('watch', ['connect', 'serve'], function () {
-    var server = $.livereload();
-
-    // watch for changes
-
-    gulp.watch([
-        'app/*.html',
-        '.tmp/styles/**/*.css',
-        'app/scripts/**/*.js',
-        'app/images/**/*'
-    ]).on('change', function (file) {
-        server.changed(file.path);
+gulp.task('serve', ['styles'], function () {
+    browserSync.init(null, {
+        server: {
+            baseDir: ['app', '.tmp'],
+            directory: true
+        },
+        debugInfo: false,
+        open: false,
+        host: 'localhost'
+    }, function (err, bs) {
+        require('opn')(bs.options.url);
+        console.log('Started web server on ' + bs.options.url);
     });
+});
 
+gulp.task('watch', ['serve'], function () {
+
+    gulp.watch(['app/*.html'], reload);
+ 
     gulp.watch('app/styles/**/*.scss', ['styles']);
     gulp.watch('app/scripts/**/*.js', ['scripts']);
     gulp.watch('app/images/**/*', ['images']);
+    gulp.watch('bower.json', ['wiredep']);
 });
diff --git a/package.json b/package.json
index 3e3df328..4ed9caf3 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "gulp-size": "^0.3.0",
     "gulp-uglify": "^0.2.1",
     "gulp-useref": "^0.4.3",
+    "browsersync": "^0.9.1",
     "jshint-stylish": "^0.2.0",
     "opn": "^0.1.1",
     "wiredep": "^1.4.3"