completed issue #27