Merge pull request #7 from 306808700/master

Auto merge by kpm server