Rev for 0.2.4