Allow multiple marks in scanpp.
Document changes to scanpp.
Merge branch 'scanpp'