#5 fixed bug that validation mode of XO unit was not evaluated
Merge remote-tracking branch 'origin/master'