Merge pull request #1 from exhibit/master

合并作者更新
Merge pull request #2 from lost-an/master

2013-8-12