fixed #15
fixed #13