merged master into paullojorgge-tcinet