merge w. giulio (master)

this will break gcc 4.6 compatibility?