Try this, im not sure if i was able to fix the water and lava thing but others devs can feel free to modify the code, download at the github:...
If you could please tell us what version you would like it in.
Separate names with a comma.