Merge pull request #124 from gwenonacouch/stage

annotations update 2.5 prt 2