Fixes issue 35
Merge pull request #36 from ESGF/devel

Fixes issue 35