some additions from Google Code wiki