Initial contribution of capu 0.3.6