fixes #35
better handling of only and except
Merge pull request #36 from wisepotato/2.2

fixes #35