Version 2.3, fixes #17