Fixes #3 and resolves #4.