The Deliverable 3.4 by EPFL-B: A controller architecture for the combination of rhythmic and discrete movements