Addressed review comments from pull request #241
Merge pull request #244 from Benglin/ReviewComment

Addressed review comments