fixed #37
fixed #36
fixed #38