[Issue #165][Finished] Fixed nourhan's comments