Merge pull request #37 from lategoodbye/master

replace magic numbers
Ignore filler DIF (= 0x2F)
Make my last change more readable.

As suggested by lategoodbye. Also make it more in line with the way
everything else is written.
Merge pull request #38 from keepfocus/master

Handle filler DIF