V0.23, fixes #105 .