bug fixed & doc improved