update 14:28
Merge pull request #26 from sirzxj/master

Auto merge by kpm server