Add action filter
Clearify action filter logic
Merge pull request #19 from monkeyherder/master

Add action filter