Updated based on concerns raised in issue #34