build
Merge pull request #8 from shepherdwind/master

Auto merge by kpm server