Updated.
Bugs fixed and improvement.