bf 456
Merge branch 'bugfix' of https://github.com/haloz/webgl-scratch into bugfix