Pull request 66

Fixes #66, obviates and closes #63, relates to #38.