Merge branch 'origin/pedro'
Small mistake commited on cleanup now fixed
Merge branch 'origin/master'