Closes #25
Closes #18