Updated for 0.2.4 tag