Plugin

Merge in the plugin v1.0.0