fixes #34 - usage of xor operator
Merge remote-tracking branch 'origin/master'