Fixed #17
Handleing exclude fields differently now. Should really add some
unit tests.