I have addressed the feedback from #16, please review