Fixes #54
Fixes #30