Merge pull request #7 from KhronosGroup/master

Merge master branch of Khronos