added support for WP pages
merged remote