Use 'or' instead of 'if' when appropiate
Merge pull request #1 from palango/master

Use 'or' instead of 'if' when appropiate