closes #21, up to 0.8.0.1