Fixes #43
Fixes #41