Fixes #8
Fixes #16