completed issue #24