Updated with Wordpress 4.0 Beta 4