Dev/kwiver integration