fixed #17 fixed #1