Closes #24
Closes #25