Closes #16
Closes #17