Data file Header changed to not use NSData to keep size constant.
Merge remote-tracking branch 'veris/master'
Merged in Alyosha’s changes.