This fixes #2, resolves #3 and closes #4