Completed issue #2