Verified WordPress 4.0 Compatible

git-svn-id: https://plugins.svn.wordpress.org/badge/trunk@981788 b8457f37-d9ea-0310-8a92-e5e31aec5664
Slight hardening of the source

git-svn-id: https://plugins.svn.wordpress.org/badge/trunk@981821 b8457f37-d9ea-0310-8a92-e5e31aec5664