Added abort filter.
Merge branch 'issue-15' into develop