fixed null in unparser
merged branches and fixed null in unparse