fixed #4
fixed #11