Fixes #13
Fixes #8