Replace deprecated operator 'or' with '||'
Merge pull request #133 from joaosa/master

Replace deprecated operator 'or' with '||'