Add exclusions to fix merge request issue #6
Minor performance enhancements