manual merge from demo branch, moved byteArray and CSS fix into superclass