Merge Fixes for Issue #147