Merge pull request #180 from adam-m/master

file carving support in datamodel