Update v2.0.7 (Fixes #13)