Fix formatting.  Fix namespacing.  Issue #7.
Fix issue where column names don't match number of columns.