Closes #151
Closes #152