minor
Merge branch 'erick' into python