Completed issue #84