Texture support

- Merging texture support into master