If now behind option initialization
Merge branch 'master' of github.com:tronje/hlr

Conflicts:
	08/pde/partdiff-mpi.c