This fixes #10 and also resolves #11, closes #17