Incorporated suggesteions for pull request #92