merge latest liquid changes #18

Closed pixelfreak2005 closed 10 years ago