Corrected include/exclude bug #25 #29 #45