Updated based on concerns raised in issue #34

Close #34