Made if statement more generic and clarified which entity is the special case.
Merge branch 'master' of https://github.com/kerp1/tripleam