Merge pull request #47 from janm399/master

Actor filtering