Annex60

Merge changes for Annex 60, including unittests and doctests, to master.