Merge pull request #12 from luminaashelia/master

edit