Fixes #108, fixes #114 - ucfirst headers