Fixed page proofs
Merge branch 'develop'