Changes per code review feedback.
Add a newline at the end of the file.
Merge pull request #31 from eric-wu/master

Changes from code review.