Additions I forgot in the last commit.
Merge pull request #475 from sungeunchoi/test

Additions I forgot in the last commit.

These should have been part of #474.  I blame my cold.