Fixes #48
Fixes #54