added header option
Merge branch 'bugfix/empty-header' into develop