Update

added new feature & small bug fix.