Merge branch 'master' into devel
add docs
better message type support
Forgot to remove.
Merge branch 'devel'
add docs.