Merge pull request #5 from TonyWael/master

to develepors branch