new version with fix for #27 and #31