2.0b: mass bugfix + examples