Merge pull request #4 from mariusooms/wordpress-4

wordpress-4 branch commit