Performed code review - issue #30
Fixed issue 36