bugfix: wrong usage of response header
minor changes to build process
mergin upstream
deleted newline
refactoring and merging
Merge pull request #22 from wick-ed/master

reviewed diff and reviewed locally