texture fixing
Merge remote-tracking branch 'origin/master'
added gui functionality
Merge remote-tracking branch 'origin/master'