Try at fix for issue #3.
Added special case to entity matching. Fixes #3.
Pulled in changes from Upstream