Closes #12
Closes #4