Merge pull request #2 from dickeylth/master

Auto merge by kpm server