Issue #22: Update to version 3.5.