Merge pull request #2 from Dictee/master

Merge pull request #1 from Dictee/gh-pages
Merge pull request #3 from Dictee/gh-pages

Merge pull request #2 from Dictee/master