merges master into parser