diff --git a/layouts/shortcodes/on-off.html b/layouts/shortcodes/on-off.html
index 0f74280..4194899 100644
--- a/layouts/shortcodes/on-off.html
+++ b/layouts/shortcodes/on-off.html
@@ -1,4 +1,4 @@
-{{ $mode := .Get 0 }}{{ $opt := .Get 1 }}
+{{ $mode := .Get 0 }}{{ $opt1 := .Get 1 }}{{ $opt2 := .Get 2 }}
 
 {{ $img_on := ( printf "%s%s"  $.Page.Site.BaseURL "img/on-off/switch-on-icon_smal.png" )}}
 {{ $img_off := ( printf "%s%s"  $.Page.Site.BaseURL "img/on-off/switch-off-icon_smal.png" )}}
@@ -8,18 +8,24 @@
 {{ else if eq $mode "off"}}
    <img src="{{ $img_off }}" alt="Off">
 {{ else if eq $mode "imgping" }}
-  {{ with $opt }}
-    {{ $id := md5 $opt }}
-    <img id={{ $id }} src="{{ $img_off }}" alt="Off">
+  {{ with $opt1 }}
+    {{ $id := md5 $opt1 }}
+    {{ if eq $opt2 "on" }}
+      <img id={{ $id }} src="{{ $img_on }}" alt="On">
+    {{ else }}
+      <img id={{ $id }} src="{{ $img_off }}" alt="Off">
+    {{ end }}
     <script language="JavaScript">
       var imgping = new Image();
-      imgping.src = '{{ $opt }}';
+      imgping.src = '{{ $opt1 }}';
       if(imgping.height>0){
         document.getElementById("{{ $id }}").outerHTML ='<img src="{{ $img_on }}" alt="On">';
+      } else {
+        document.getElementById("{{ $id }}").outerHTML ='<img src="{{ $img_off }}" alt="Off">';
       }
     </script>
   {{ else }}
-    Ned URL to image
+    imgping [URL to image] [default on/off]
   {{ end }}
 {{ else }}
    ???