Fix annotator framework
Merge branch 'master' of https://github.com/bartcharbon/molgenis