liquid fixes
Merge pull request #31 from tomaszrondio/master

fixes