Merge pull request #1 from KISRDevelopment/master

pullreq