Better Extendability
Removed unused param
Merge commit '25c73d6b55871daee6c46f05745a1eec709e0c57' from frido37

Conflicts:
	pom.xml
Merge commit '94a069d2f7c12c65ce307f56aeb54a66c3a5ba14' from frido37

Conflicts:
	pom.xml