add event 'remove', use better regex, @buganini ++