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