[feature fix #60]