Add flat file loader
Fix failing test case.
Merge remote-tracking branch 'origin/master'