Completed issue #43