bug fixes
Merge pull request #4 from MohamedBassem/almgohar

bug fixes