worked on issue #19