Completed issue #61