bug fixes
Merge pull request #3 from MohamedBassem/almgohar

bug fixes