Closes #9
Closes #14