Osama

@Omar-ElAzazy please review my code. Thanks!