Worked on issue #19