First version of filter
Merge remote-tracking branch 'dacav/infrastucture' into infrastructure

Conflicts:
	src/Makefile.am
Merge remote-tracking branch 'dacav/infrastucture' into infrastructure
Filter is even dummier...
Threaded version of lookup
Merge remote-tracking branch 'war/infrastructure' into infrastucture