initial support for CSS display:block property value
code simplification
Merge branch 'master' into beta