Feature/wordpress

Latest updates from wordpress branch...