my changes ( carles ) to solve compile problems xocde 5.2