Status code in header & fix encoding errors
Fixed error controller
Merge branch 'nakasoft-master'