Added NOT to some generated annotations
Merge branch 'master' into tests