Merge branch 'refs/heads/issue-1' into issue-3
Add BeforeParser
Add AfterParser