Updated for 1.0.2+