Fixed #14
fixed #9