diff --git a/dist/leaflet.awesome-markers.js b/dist/leaflet.awesome-markers.js
index 8705fcea8d..56fc6317fb 100644
--- a/dist/leaflet.awesome-markers.js
+++ b/dist/leaflet.awesome-markers.js
@@ -48,7 +48,13 @@ L.AwesomeMarkers.Icon = L.Icon.extend({
   },
 
   _createInner: function() {
-    return "<i class='icon-" + this.options.icon + (this.options.spin ? " icon-spin'" :"'") + "></i>";
+    var iconClass;
+    if(this.options.icon.slice(0,5)==="icon-"){
+      iconClass=this.options.icon;
+    }else{
+      iconClass="icon-"+this.options.icon;
+    }
+    return "<i class='" + iconClass + (this.options.spin ? " icon-spin'" :"'") + "></i>";
   },
 
   _setIconStyles: function (img, name) {
diff --git a/examples/basic-example.html b/examples/basic-example.html
index 8daad30f9d..da11325c94 100644
--- a/examples/basic-example.html
+++ b/examples/basic-example.html
@@ -28,7 +28,7 @@
     }).addTo(map);
 
     L.marker([51.941196,4.512291], {icon: L.AwesomeMarkers.icon({icon: 'spinner', color: 'red', spin:true}) }).addTo(map);
-    L.marker([51.927913,4.521303], {icon: L.AwesomeMarkers.icon({icon: 'coffee', color: 'red'}) }).addTo(map);
+    L.marker([51.927913,4.521303], {icon: L.AwesomeMarkers.icon({icon: 'icon-coffee', color: 'red'}) }).addTo(map);
     L.marker([51.936063,4.502077], {icon: L.AwesomeMarkers.icon({icon: 'food', color: 'purple'}) }).addTo(map);
     L.marker([51.932835,4.506969], {icon: L.AwesomeMarkers.icon({icon: 'glass', color: 'green'}) }).addTo(map);
     L.marker([51.930295,4.515209], {icon: L.AwesomeMarkers.icon({icon: 'shopping-cart', color: 'blue'}) }).addTo(map);