Updated pdf. Merging to bring everything closer to master. Then branching again.