Fix #7
Merge branch 'fix-statuscodes-1'