Merge pull request #514 from vanderlee/patch-1

Fix #512; change either/or where both are allowed