Fixes #69
Closes #72