Closes #17
Closes #15