#260 actionHeader needed some tweaks
Merge branch '0.6.0' into 0.5.0