updated and merged with HEAD of sampleextension and tclconfig

Signed-off-by: Matthias Kraft <M.Kraft@gmx.com>