- Fixes #46, #49