Merge branch 'field-filtering'
typo fix #22