Latexbranch

Merging current state of latexbranch.