Merge pull request #12 from luminaashelia/master

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

Merge pull request #12 from luminaashelia/master