更新
Merge pull request #14 from macroth/master

Auto merge by kpm server