fix class downloads with multiple headers per unit
Merge pull request #1 from wesen/master

fix class downloads with multiple headers per unit