updated to latest upstreams and depend on bundle version 0.0.3