Worked on issue #33 and #38