Added texture loading, it is working now!
Merge remote-tracking branch 'origin/master'