Merge pull request CH-Earth#208 from bartnijssen/master

Merge develop into master for Version 2.0

Merge pull request CH-Earth#76 from UCAR/develop

Release merge from develop to master