Closes #17
Closes #18