Some strong emphasis and additions/clarifications for #19

Auto-merging