v2.4 bugfix release - Fixes #10