Initial commit of untested fix for issue 13.