Merge pull request #7 from TonyWael/hotfix

Hotfix