Added clarifying comments
Merge branch 'master' into dev/csv