update
Merge pull request #10 from ottomao/master

Auto merge by kpm server