Fixes #95
Fixes #56