This pull request addresses the following issues:

* Fetch both tokens in XOR
* Add missing break statements
Merge pull request #2 from forestbelton/bugfixes

This pull request addresses the following issues: