bugfix
bugfix
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	poets/image/netcdf.py
Updated docstrings
bugfix
Merge pull request #4 from IsabellaP/develop

Develop