merge latest liquid changes

last changes 19/06/14