Fixes once and for all the moving process
Merge remote-tracking branch 'origin/master'