Users edit method improved
pulled master