mdsumner solve merge issue #9