Merge pull request #6 from Madimo/master

喵!