2.0.2, closes #41