fix build
Merge remote-tracking branch 'origin/sookee-0.1' into katina-0.1