Added some plugins from Damien Conway