Fixes #10

Manually merged 2f4e956