Fixes #12
Fixes #13