#44

Issue #44 

Please @marwa-mehanna @Dayna161193 @omar-kassem @muhammedabuali  please review to merge to master