Updated to v1.2 (from wordpress.org)