merged changes
Merge pull request #10 from essamjoubori/master

merged changes