header: some fixes
Merge branch 'master' of github.com:saloon/saloon