closes #102 refs #91 refs #87