Cross-cutting corrections and additions
Merge pull request #31 from jfabry/master

Cross-cutting corrections and additions