Fix priority bug with or
Silence push-on-reference warnings
Merge pull request #1 from maugier/master

Minor bugfixes and cosmetic changes