Merge pull request #8 from HollyDAI/master

哈哈哈哈