Bug Fix do Luis
Merge branch 'localdev' into develop