Merge pull request #6 from luminaashelia/master

edit
Merge pull request #7 from luminaashelia/gh-pages

Merge pull request #6 from luminaashelia/master