Fixes issue #903, now checks for metadata column if mapping file provided
Merge pull request #921 from danknights/master

Fixes issue #903