#75
Fixes #80
Closes #76