[issue16] Changes suggested by Rick Lamb and discussed in Issue #16