Fixes #152
Closes #155