[0.3.1] Begins work on #24 and resolves #8.