v1.0.7 from SVN