issue #19 implemented