Tested with latest version
Improved structure

git-svn-id: https://plugins.svn.wordpress.org/404-to-301/trunk@1037714 b8457f37-d9ea-0310-8a92-e5e31aec5664