added general filtering and fixed form
removed some typos and trailing comments
intermediate state
Merge remote-tracking branch 'upstream/master' into filtering
done with first step of document filtering
some more modifications
comments and issues addressed
Merge pull request #26 from voisardf/filtering

Filtering