Merge pull request #1 from dickeylth/master

Auto merge by kpm server