Pull of actual version

The actual version should be merged into this plugin.