Closes #18
Closes #19