Merge branch 'master' into devel
Finished GESDISC/OMI examples.
No pyc files in the 'git status'
Merge branch 'issue6' into devel
Merge branch 'devel'