Fixes #10, closes #10.