better prevention of name clashes
Merge pull request #78 from cmw/configurable_column_names

better prevention of name clashes