Merge pull request #310 from lbl-srg/Annex60Sync

Annex60 sync
Reformatted code