Changed if/else definition to make language unambiguous
Commenting the change of the ChangeLog is a bit too much, is it not?