This closes #144
This closes #143