Update to v2.0

Could you deploy this on the wiki? Thanks!