Closes #11
Closes #9