Fixes #11
Fixes #14