Initial checkin before ZabConf2014