new class param, for storing user defined parameters
Edit input interface
Merge branch 'master' into pruning

Conflicts:
	src/Makefile.am