Bug fixed and feature enhanced.