completed issue #19