Fixes #18
Fixes #19