diff --git a/lib/gemojione.rb b/lib/gemojione.rb
index cff03ef7..3f2fbba7 100644
--- a/lib/gemojione.rb
+++ b/lib/gemojione.rb
@@ -75,7 +75,7 @@ def self.image_url_for_unicode_moji(moji)
   def self.image_tag_for_moji(moji)
     if use_sprite
       emoji = index.find_by_moji(moji)
-      %Q{<span class="emojione emojione-#{emoji['unicode'].to_s.downcase}" alt="#{ moji }" title="#{ moji }">#{ moji }</span>}
+      %Q{<span class="emojione emojione-#{emoji['unicode'].to_s.downcase}" alt="#{ emoji['name'] }" title="#{ emoji['shortname'] }">#{ moji }</span>}
     else
       %Q{<img alt="#{moji}" class="emoji" src="#{ image_url_for_unicode_moji(moji) }"#{ default_size ? ' style="width: '+default_size+';"' : '' }>}
     end
diff --git a/lib/gemojione/version.rb b/lib/gemojione/version.rb
index e275a1c5..6bb51434 100644
--- a/lib/gemojione/version.rb
+++ b/lib/gemojione/version.rb
@@ -1,3 +1,3 @@
 module Gemojione
-  VERSION = "4.0.0"
+  VERSION = "4.1.0"
 end
diff --git a/test/gemojione_test.rb b/test/gemojione_test.rb
index d84e18eb..c544eca4 100644
--- a/test/gemojione_test.rb
+++ b/test/gemojione_test.rb
@@ -74,7 +74,7 @@
 
     it 'should generate spritesheet tag' do
       with_emoji_config(:use_sprite, true) do
-        assert_equal "<span class=\"emojione emojione-1f300\" alt=\"🌀\" title=\"🌀\">🌀</span>", Gemojione.image_tag_for_moji('🌀')
+        assert_equal "<span class=\"emojione emojione-1f300\" alt=\"cyclone\" title=\":cyclone:\">🌀</span>", Gemojione.image_tag_for_moji('🌀')
       end
     end
   end
@@ -99,7 +99,7 @@
       with_emoji_config(:use_sprite, true) do
         base_string = "I ❤ Emoji"
         replaced_string = Gemojione.replace_unicode_moji_with_images(base_string)
-        assert_equal "I <span class=\"emojione emojione-2764\" alt=\"❤\" title=\"❤\">❤</span> Emoji", replaced_string
+        assert_equal "I <span class=\"emojione emojione-2764\" alt=\"heart\" title=\":heart:\">❤</span> Emoji", replaced_string
       end
     end
 
@@ -167,7 +167,7 @@
       with_emoji_config(:use_sprite, true) do
         base_string = "I :heart: Emoji"
         replaced_string = Gemojione.replace_named_moji_with_images(base_string)
-        assert_equal "I <span class=\"emojione emojione-2764\" alt=\"❤\" title=\"❤\">❤</span> Emoji", replaced_string
+        assert_equal "I <span class=\"emojione emojione-2764\" alt=\"heart\" title=\":heart:\">❤</span> Emoji", replaced_string
       end
     end
 
@@ -266,7 +266,7 @@
     it 'should replace ascii moji with span tag for sprite' do
       with_emoji_config(:use_sprite, true) do
         replaced_string = Gemojione.replace_ascii_moji_with_images("Emoji is :-)")
-        assert_equal "Emoji is <span class=\"emojione emojione-1f604\" alt=\"😄\" title=\"😄\">😄</span>", replaced_string
+        assert_equal "Emoji is <span class=\"emojione emojione-1f604\" alt=\"smile\" title=\":smile:\">😄</span>", replaced_string
       end
     end
   end