better error codes
Merge branch 'develop'