fixed #35
fixed #34
#33 fixed