Merge pull request #1 from satans17/master

Auto merge by kpm server