Minor changes.
Merge pull request #51 from ernstchan/minor-changes

Minor changes.