Applied code review on pull request #185