Fixes #49
Fixes #50