Merging functions.. 
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
typo in maintenance
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>