@pchlupacek
pchlupacek Merge pull request #1241 from mpilquist/topic/additional-comments-fro… 
…m-1240

Addressed additional review comments from #1240
Latest commit 8a5086b Aug 28, 2018