This fixes #12, and resolves #13.