Updated plugin to 2.0

Please pull this in - as well as create the 1.3 branch. Danke!