documentation
Merge branch 'doc' into dev