fix
add issue#33 and issue#40