Issue #183 fixing

#183 please review @rami-khalil @mohamedsaeed93 @Sharaf93 @mimikian @fadel1493