v3.3.0; closes #8