Updated based on concerns raised in issue #34

Updated based on concerns raised in issue #34