- worked on issue #54
- fixed issue #56