completed issue #9