fixed #10 fixed #17