FIX:basing issues Restart
FIX: add changes to test_source_estimate
Merge pull request #1366 from dgwakeman/annot_semantics

Annot semantics