Completed issue #35