updates, including fix for issue #26