rename status to message
Merge branch 'master' into dev
add external field
better parser
Merge remote-tracking branch 'origin/master'
merge