update
Merge pull request #13 from shepherdwind/master

Auto merge by kpm server