diff --git a/global-templates/hero.php b/global-templates/hero.php
index 1cb20b1..e308cde 100644
--- a/global-templates/hero.php
+++ b/global-templates/hero.php
@@ -7,7 +7,7 @@
 
 ?>
 
-<?php if ( is_active_sidebar( 'hero' ) or is_active_sidebar( 'statichero' ) ) : ?>
+<?php if ( is_active_sidebar( 'hero' ) || is_active_sidebar( 'statichero' ) ) : ?>
 
 	<div class="wrapper" id="wrapper-hero">
 	
diff --git a/gulpfile.js b/gulpfile.js
index 203a31b..e5ef1ae 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -33,6 +33,7 @@ var rename = require('gulp-rename');
 var concat = require('gulp-concat');
 var uglify = require('gulp-uglify');
 var merge2 = require('merge2');
+var imagemin = require('gulp-imagemin');
 var ignore = require('gulp-ignore');
 var rimraf = require('gulp-rimraf');
 var clone = require('gulp-clone');
@@ -102,7 +103,19 @@ gulp.task('sass', function () {
 gulp.task('watch', function () {
     gulp.watch('./sass/**/*.scss', ['sass']);
     gulp.watch('./css/theme.css', ['cssnano']);
-    gulp.watch([basePaths.dev + 'js/**/*.js','js/**/*.js','!js/theme.js','!js/theme.min.js'], ['scripts'])
+    gulp.watch([basePaths.dev + 'js/**/*.js','js/**/*.js','!js/theme.js','!js/theme.min.js'], ['scripts']);
+
+    //Inside the watch task.
+    gulp.watch('./img', ['imagemin'])
+});
+
+// Run:
+// gulp imagemin
+// Running image optimizing task
+gulp.task('imagemin', function(){
+    gulp.src('img/*')
+    .pipe(imagemin())
+    .pipe(gulp.dest('img'))
 });
 
 
diff --git a/loop-templates/content-none.php b/loop-templates/content-none.php
index 48b586a..e1c16fa 100644
--- a/loop-templates/content-none.php
+++ b/loop-templates/content-none.php
@@ -22,7 +22,8 @@
 		<?php
 		if ( is_home() && current_user_can( 'publish_posts' ) ) : ?>
 
-			<p><?php printf( wp_kses( __( 'Ready to publish your first post? <a href="%1$s">Get started here</a>.', 'understrap' ), array( 'a' => array( 'href' => array() ) ) ), esc_url( admin_url( 'post-new.php' ) ) ); ?></p>
+			<p><?php printf( wp_kses( __( 'Ready to publish your first post? <a href="%1$s">Get started here</a>.', 'understrap' ), 
+			array( 'a' => array( 'href' => array() ) ) ), esc_url( admin_url( 'post-new.php' ) ) ); ?></p>
 
 		<?php elseif ( is_search() ) : ?>
 
diff --git a/package.json b/package.json
index 317b252..65d8149 100644
--- a/package.json
+++ b/package.json
@@ -6,11 +6,9 @@
   "scripts": {
     "postinstall": "gulp copy-assets"
   },
-
-  "engines" : { 
-  "npm" : ">=2.1.8" 
+  "engines": {
+    "npm": ">=2.1.8"
   },
-
   "repository": {
     "type": "git",
     "url": "https://github.com/holger1411/understrap.git"
@@ -38,6 +36,7 @@
     "gulp-concat": "^2.6.1",
     "gulp-cssnano": "^2.1.2",
     "gulp-ignore": "^2.0.2",
+    "gulp-imagemin": "^3.1.1",
     "gulp-merge": "^0.1.1",
     "gulp-plumber": "^1.1.0",
     "gulp-rename": "^1.2.2",