#117

Adaption for malmoheader