fix bug for location columns with spaces in them
Merge branch 'master' into gh-pages