Add support for exclusions
Merge branch 'excludes'