revved version for release with fix for #21