This fixes #2 and also resolves #3.