Completed issue #5