updared for WP 4.1