Merge pull request #33 from jdchristensen/exclude

fix include/exclude bugs and add more tests