Merge branch 'erick' into python
documentation
Merge branch 'python' into erick