annotation proposal
Merge branch 'master' of https://github.com/Rudin-Informatik/core.git