Closes #15
Closes #12