Created issue #24