split into two separate predicates
Merge pull request #114 from mikey179/master

split into two separate predicates