Merge branch 'develop'

.travis.yml

@@ -13,3 +13,12 @@ sudo: false
 cache:
   directories:
     - node_modules
+
+# hooks
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/e369617839852624aa69
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: false     # default: false

README.md

@@ -1,6 +1,6 @@
 ![Showdown](https://raw.githubusercontent.com/showdownjs/logo/master/dist/logo.readme.png)
 
-[![Build Status](https://travis-ci.org/showdownjs/showdown.svg?branch=master)](https://travis-ci.org/showdownjs/showdown) [![npm version](https://badge.fury.io/js/showdown.svg)](http://badge.fury.io/js/showdown) [![Bower version](https://badge.fury.io/bo/showdown.svg)](http://badge.fury.io/bo/showdown)
+[![Build Status](https://travis-ci.org/showdownjs/showdown.svg?branch=master)](https://travis-ci.org/showdownjs/showdown) [![npm version](https://badge.fury.io/js/showdown.svg)](http://badge.fury.io/js/showdown) [![Bower version](https://badge.fury.io/bo/showdown.svg)](http://badge.fury.io/bo/showdown) [![Join the chat at https://gitter.im/showdownjs/showdown](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/showdownjs/showdown?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 ------
 
@@ -21,6 +21,11 @@ You can download the latest release tarball directly from https://github.com/sho
 
     npm install showdown
 
+### CDN
+
+You can also use github CDN directly in your html file(s).
+
+    https://cdn.rawgit.com/showdownjs/showdown/<version tag>/dist/showdown.min.js
 
 ## Browser Compatibility
 

package.json

@@ -2,7 +2,12 @@
   "name": "showdown",
   "version": "1.0.1",
   "description": "A Markdown to HTML converter written in Javascript",
-  "authors": "Estevão Santos",
+  "author": "Estevão Santos",
+  "homepage": "http://showdownjs.github.io/showdown/",
+  "keywords": [
+    "markdown",
+    "converter"
+  ],
   "contributors": [
     "John Gruber",
     "John Fraser",