0.2.1
Really fix #43: Forgot to include the actual fix. NEED TESTS.