* Closes #8