Merge remote-tracking branch 'ricardo-vieira/develop' into develop
Update docs