Issue 610 patch added
Merge pull request #10 from sajinidesilva/Issue610

Issue 610 patch added