Merge pull request #1 from Manthyial/master

Merge