Marc Header

Merged Sid Sijbrandij requested to merge marc-header into master