Issue #360 Addressed review comments.