Better error codes in repsonses
Merge branch 'master' into dev