bugfix: header option when no-timestamp
Merge branch 'develop'