closes #101 refs #87