Merge pull request #8 from luminaashelia/master

merge