Update to 2.0.7 (Fixes #10)