(v1.0.3) Compatible with Craft 2.3