This fixes #2 and closes #2