Merge pull request #1 from almasaeed2010/master

Updates