Add day/night, and coal
Merge branch 'refs/heads/master' into gh-pages