Refactor of cocktail party
Changed some transitions
Merge pull request #340 from reem-utils/cris_branch

Cris branch