Closes #54
Closes #53