Closes #128
Closes #129