Merge pull request #1 from stoneharry/master

Merge with Stoneharrys