Closes #40. refs #60