Updated v2.0.7 (Fixes #10)