Updated for deployment to wordpress.org