worked on issue #34