more robust style class handling
Merge branch 'master' into raster