Updated to be used with FireFox Plugin, removed trailing WS at EOL