Fixes #42
Temp
Fixes #43
Fixes #41
Fixes #42
Merge pull request #44 from simonbernard/bugs-41-42-43

Fixes #41
Fixes #42
Fixes #43