Adrian comments #2
Merge pull request #235 from jgho/comments2

Adrian comments #2