update 14:56
Merge pull request #31 from sirzxj/master

Auto merge by kpm server