Merge fixes for Issue #45