Closes #166
Fixes #167