v0.2 Closes #8. Closes #7