fix baby rain and additive colouring
Merge branch 'master' into gh-pages
json