merging branch from pb/pb

adding latex plugin, merging branches