diff --git a/.gitignore b/.gitignore
index 4a94011..ea8bc03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 .buildpath
 .project
-.settings/org.eclipse.php.core.prefs
+.settings
+.idea
 .DS_store
-demo/.DS_store
-.DS_Store
-demo/.DS_Store
+*~
diff --git a/README.md b/README.md
index e202b54..e38468e 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,60 @@
-payment-webfont
-===============
+Payment webfont icons
+=====================
 
-An SVG webfont full of icons of main payment systems created by @orlandotm with Icomoon.io
+An SVG webfont full of icons of main payment systems created by [@orlandotm](http://twitter.com/orlandotm) with [Icomoon](http://icomoon.io).
+
+Disclaimer
+----------
 
 All trademarks are the property of their respective owners; third-party brands, product names, trade names, corporate names and companies mentioned herein may be the trademarks of their respective owners or registered trademarks of other companies and have been used for purposes of explanation and to the owner's benefit, without implying a violation of copyright law.
 
-Included Glyphs
-===============
+Glyphs
+------
+
+![Payment webfont glyphs](https://raw.githubusercontent.com/orlandotm/payment-webfont/master/preview.jpg "Payment webfont glyphs")
+
+* Mastercard
+* Maestro
+* Visa
+* Visa Electron
+* American Express
+* Postepay
+* Cartasì
+* Diners Club
+* Discover
+* Union Pay
+* Electronic Cash
+* TrustE
+* Amazon
+* JCB
+* Google Wallet
+* Stripe
+* Square
+* Ogone
+* VeriSign
+
+Installation
+------------
+
+### Using [Composer](http://packagist.org/packages/orlandotm/payment-webfont)
+    
+To install with composer add `orlandotm/payment-webfont` to your `composer.json`. E.g.,
+
+```
+{
+  "require": {
+    "orlandotm/payment-webfont": "*"
+  }
+}
+```
+
+### Using [Component](https://github.com/component/component)
+    
+To install as a component just run `component install orlandotm/payment-webfont`.
+
+Or add `orlandotm/payment-webfont` to the dependencies element into your `component.json`.
+
+---
 
-![alt text](https://raw.githubusercontent.com/orlandotm/payment-webfont/master/preview.jpg "Included Glyphs")
+[![Analytics](https://ga-beacon.appspot.com/UA-50602721-1/orlandotm/payment-webfonts)](https://github.com/igrigorik/ga-beacon)
 
-Mastercard, Maestro, Visa, Visa Electron, American Express, Postepay, Cartasì, Diners, Discover, Union Pay, Electronic Cash, TrustE, Amazon, JCB, Google Wallet, Stripe, Square, ogone, VeriSign
diff --git a/component.json b/component.json
new file mode 100644
index 0000000..e76fdda
--- /dev/null
+++ b/component.json
@@ -0,0 +1,23 @@
+{
+  "name": "payment-webfont",
+  "repo": "orlandotm/payment-webfont",
+  "version": "0.9.0",
+  "description": "An SVG webfont full of main payment system icons",
+  "keywords": [
+    "icon",
+    "font",
+    "component",
+    "svg",
+    "payment"
+  ],
+  "fonts": [
+    "fonts/payment-webfont.eot",
+    "fonts/payment-webfont.svg",
+    "fonts/payment-webfont.ttf",
+    "fonts/payment-webfont.woff"
+  ],
+  "styles": [
+    "style.css"
+  ]
+  "license": "CC0-1.0"
+}
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..f815131
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,35 @@
+{
+  "name": "orlandotm/payment-webfont",
+  "description": "An SVG webfont full of main payment system icons",
+  "homepage": "https://github.com/orlandotm/payment-webfont",
+  "keywords": [
+    "font",
+    "payment",
+    "icon",
+    "webfont",
+    "svg"
+  ],
+  "authors": [
+    {
+      "name": "Orlando Merone",
+      "email": "orlando.merone@gmail.com",
+      "homepage": "http://www.orlandotm.com",
+      "role": "Developer"
+    },
+    {
+      "name": "Leo Di Donato",
+      "email": "leodidonato@gmail.com",
+      "homepage": "http://github.com/leodido",
+      "role": "Maintainer"
+    },
+    {
+      "name": "Leonardo Grasso",
+      "email": "me@leonardograsso.com",
+      "homepage": "http://github.com/leogr",
+      "role": "Maintainer"
+    }
+  ],
+  "license": [
+    "CC0-1.0"
+  ]
+}