Changes per code review feedback.
Merge pull request #80 from eric-wu/develop

Changes per code review feedback.