fixed #10
fixed #11