Dev/kwiver integration

Good catch.