merge katina-0.1 into katina-0.2