Fixed #14.
Fixed #23.
Refs #22.