Merge (more or less) recent changes from development into master

This MR merges several fixes that have been tested in development into master. Some of these fixes have been around for around 6 months...

Fixes #4 (closed), #5 (closed), #6 (closed).

The development code was tested in ShaDoc because we included the YAML file from development there.