Merge pull request #6 from rotty3000/trim-and-excludes

Trim and excludes