Merge pull request #6 from doin/master

Auto merge by kpm server