Merge fixes for Issue #92