Merge pull request #1 from thelock12/master

Benz > nong
Merge pull request #1 from Anuruth/master

nong > benz