Merge Fixes for Issue #14