Updated master to 2.02 (from SourceForge)