Merge fixes for Issue #64