Fixes #5 completely.