Updated plugin and docs
Merge branch 'master' into new/data/model