added vector primitives
merge fix