removed printfs
Merge branch 'master' into texture
using the right texture