Fixed water/lava interaction
Added some comments
Merge pull request #764 from xdot/master

Fixed water/lava interaction