fixed #9
fixed #13
fixed #11