working commit, check for no special fields
More updates
Merge pull request #3 from elinw/davidsbranch

Merge Elin's