Updates based on PR comments:

- #7
- https://www.pivotaltracker.com/story/show/67751402
[Fixes #67751402]