implemented #43
fixed #148