Merging in fix for bug #68.