Merge pull request #5 from virajmahesh/gh-pages

Merging into master. Stable.
Merge pull request #6 from virajmahesh/master

Merge pull request #5 from virajmahesh/gh-pages