upstream rev 0.1