Merge pull request #1 from Soliman/master

Request 1