Fixxed 'or' and 'not' expressions.
Merge branches 'master', 'master' and 'master' of github.com:mathijsb/afp-ants