Added a Bambus-class.
Merge origin/master