merged updates from wp-template project