Closes #25
Closes #23