closes #16 and release for v3.30