lava bg added
Merge branch 'duncan'