Fixes #17
Fixes #16