issue #24 fixed
issue #24 fixed