fixed #9
fixed #10