refs #36
fixes #57
fixes #58