issue # 83 , like comments

@mohammad-abdulkhaliq @marwa-mehanna 
Please review :D