Completed issue #8