Updated to support WordPress 4.0