Update to v2.3.3 (Fixes #20)