added switch between canvas and opengl
added 3rd element in first and last rows + compatibility to old format
Merge branch 'master' into gh-pages