3.0.7 - closes #137