Comments added from BC
Merge pull request #1 from cangevine/master

Comments from BC