Closes #53. Refs #9