Fixed namespace and removed invalid elements
merge branch