extended testing
Merge branch 'vtk' of github.com:HerrMuellerluedenscheid/derec into vtk

Conflicts:
	derec/core.py