issue #32 fixed
issue #30