Fixes #5. Closes #1 in favor of #2 implementation.