Branch for Cigma 0.9