added security measures for carrier returns in the obj loader
André pushed broken code, this will fix it :)
Ok, now it's actually working
Merge remote-tracking branch 'origin/master' into guid
Changed function name.