diff --git a/MANIFEST b/MANIFEST
new file mode 100644
index 0000000..0f52715
--- /dev/null
+++ b/MANIFEST
@@ -0,0 +1,6 @@
+# file GENERATED by distutils, do NOT edit
+setup.cfg
+setup.py
+emojipedia/__init__.py
+emojipedia/emoji.py
+emojipedia/emojipedia.py
diff --git a/emojipedia/emoji.py b/emojipedia/emoji.py
index 98d9c18..42ff0f2 100644
--- a/emojipedia/emoji.py
+++ b/emojipedia/emoji.py
@@ -37,7 +37,7 @@ def platforms(self):
                                               {'class': 'vendor-list'})
             for vendor in platform_section.findAll('li'):
                 vendor_title = vendor.findNext('h2')
-                vendor_img = vendor.find('div',{'class':'vendor-image'})
+                vendor_img = vendor.find('div', {'class': 'vendor-image'})
 
                 platform = {
                     'title': vendor_title.text,
@@ -78,3 +78,13 @@ def character(self):
         if not self._character:
             self._character = self.soup.find('h1').text.split()[0]
         return self._character
+
+    def __str__(self):
+        string = u"<Emoji - '{0}' - character: {2}, description: {1}>"
+        string = string.format(self.title,
+                               self.description[:20] + "...",
+                               self.character)
+        return string.encode('utf-8')
+
+    def __repr__(self):
+        return self.__str__()
diff --git a/emojipedia/emojipedia.py b/emojipedia/emojipedia.py
index 419c81c..73be2ba 100644
--- a/emojipedia/emojipedia.py
+++ b/emojipedia/emojipedia.py
@@ -23,7 +23,6 @@ def valid_emoji_page(soup):
 
     @staticmethod
     def get_emoji_page(query):
-        # TODO: Allow 'seach' for emoji (non-literal title)
         response = requests.get('http://emojipedia.org/' + query)
         if response.status_code != 200:
             raise UserWarning('Could not get emojipedia page for \'{0}\''
diff --git a/examples/emoji_info.py b/examples/emoji_info.py
index 6b8d82c..9dd4c56 100644
--- a/examples/emoji_info.py
+++ b/examples/emoji_info.py
@@ -2,10 +2,11 @@
 
 face_with_tears = Emojipedia.search('face-with-tears-of-joy')
 
-print face_with_tears.title # Title
+print face_with_tears.title  # Title
 
-print face_with_tears.description # Description
+print face_with_tears.description  # Description
 
-print face_with_tears.aliases # Aliases
+print face_with_tears.aliases  # Aliases
 
-print [x['title'] for x in face_with_tears.platforms] # Prints the titles of available platforms
+# Prints the titles of available platforms
+print [x['title'] for x in face_with_tears.platforms]
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..b88034e
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[metadata]
+description-file = README.md
diff --git a/setup.py b/setup.py
index c7473a5..84fbb71 100644
--- a/setup.py
+++ b/setup.py
@@ -3,10 +3,17 @@
 from distutils.core import setup
 
 setup(name='Emojipedia',
+      packages=['emojipedia'],
       version='0.1',
       description='Emoji data from Emojipedia',
       author='Benjamin Congdon',
       author_email='bcongdo2@illinois.edu',
       url='https://github.com/benjamincongdon',
-      packages=['emojipedia'],
+      download_url='https://github.com/benjamincongdon/' +
+                   'python-emojipedia/tarball/0.1',
+      keywords=['emoji', 'emojipedia'],
+      classifiers=['Programming Language :: Python :: 2.7',
+                   'Topic :: Communications :: Chat',
+                   'Topic :: Text Processing',
+                   'Topic :: Utilities'],
       )
diff --git a/test_emojipedia.py b/test_emojipedia.py
index 40609d3..0bda9cb 100644
--- a/test_emojipedia.py
+++ b/test_emojipedia.py
@@ -26,13 +26,17 @@ def test_emoji_codepoints():
 
 def test_platforms():
     wink = Emojipedia.search('winking-face')
-    correct = ['Apple','Google','Microsoft','Samsung',
-               'LG','HTC','Twitter','Facebook','Mozilla', 'Emoji One']
-    assert set([x['title'] for x in wink.platforms]) == set(correct) # Order not important
+    correct = ['Apple', 'Google', 'Microsoft', 'Samsung',
+               'LG', 'HTC', 'Twitter', 'Facebook', 'Mozilla', 'Emoji One']
+
+    # Order not important
+    assert set([x['title'] for x in wink.platforms]) == set(correct)
     for platform in wink.platforms:
         assert 'title' in platform
-        assert 'platform_url' in platform and platform['platform_url'].startswith('/')
-        assert 'platform_image' in platform and platform['platform_image'].startswith('http')
+        assert ('platform_url' in platform and
+                platform['platform_url'].startswith('/'))
+        assert ('platform_image' in platform and
+                platform['platform_image'].startswith('http'))
 
 
 def test_emoji_shortcodes():
@@ -68,4 +72,4 @@ def test_emoji_title():
 def test_emoji_character():
     taco = Emojipedia.search('taco')
     # Python Unicode silliness
-    assert taco.character.encode('unicode_escape') == '\\U0001f32e'
\ No newline at end of file
+    assert taco.character.encode('unicode_escape') == '\\U0001f32e'