Merge pull request #1 from grodansparadis/master

Dinesh Guleria