added to wordpress.org trunk - made a few changes, updating