hehe
Merge pull request #2 from MrEleven/master

hehe