Filtering before/after, so help us God
Merge pull request #9 from jchoigw/master

Filtering before/after, so help us God