Addressed some items in issue #9.