Merge pull request #9 from shadowglen/master

merge了吧...