Updated to new plugin format (more stable) version 2.