Merge pull request #2 from ottomao/master

Auto merge by kpm server