issue #24 resolved