Closes #49
Closes #26