Improves excludes
Merge pull request #180 from nsendetzky/master

Improves excludes