Completed issue #21