features for 2.4.1, fixes #49