fixed #37
#38
fixed #36