Also handle xor rh rh
Merge branch 'issue-103' into develop