azzamsa Merge pull request #17 from ebzzry/master …