#96 Addressed comments in pull request