Merge fixes for Issue #12