3.0.6. Closes #117