#69 fixed and bump up version to 0.8.1