[issue16] Changes suggested by Rick Lamb and discussed in Issue #16
Merge pull request #27 from DNSOP/issue16

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