Fixes #7 completely.