Updating to latest version from FooPlugins Master