Closes #13
Closes #12