inital filtering.
fixed images
Merge branch 'master' into filter

Conflicts:
	manual.tex