tp-2010-021

tp-2010-021

Guido almost ready