Worked on issue 82

#82