Merge pull request #1 from Ynigvi/master

haha
Youhou