Some comments, fixed some typos.
resolve merge conflicts
Merge branch 'rpbouman-master'