Addressed comments in PR #57