Completed issue #58