V0.3.x patch85

Fixes #85 and attempts to put all required changes in one place.
Having dificulty with the rebase-squash though, might be due to the fact that I had a intermediate merge with upstream: advice welcome.