diff --git a/README.txt b/README.txt
index e7f0a34..61891f3 100644
--- a/README.txt
+++ b/README.txt
@@ -2,8 +2,8 @@
 Contributors: randyjensen,randyhoyt
 Tags: openphoto,media
 Requires at least: 3.2
-Tested up to: 3.3
-Stable tag: 0.9.4.2
+Tested up to: 3.5
+Stable tag: %VERSION_NUMBER%
 
 Insert photos from your OpenPhoto installation into your WordPress content through the media manager.
 
@@ -26,6 +26,9 @@ Find the project on [GitHub](https://github.com/openphoto/openphoto-wordpress "O
 
 == Changelog ==
 
+= 0.9.5 =
+* Fix for WordPress 3.5
+
 = 0.9.4.2 =
 * Reverting parameter name to "generate" 
 
diff --git a/openphoto-php b/openphoto-php
deleted file mode 160000
index eaa6be4..0000000
--- a/openphoto-php
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit eaa6be4f813e016bf8cb3e3cac0df8b4cda4861a
diff --git a/openphoto-wordpress.php b/openphoto-wordpress.php
index 6977f84..e0f34b5 100644
--- a/openphoto-wordpress.php
+++ b/openphoto-wordpress.php
@@ -1,10 +1,10 @@
 <?php
 /*
 Plugin Name: OpenPhoto for WordPress
-Version: 0.9.4.2
+Version: %VERSION_NUMBER%
 Plugin URI: https://github.com/openphoto/openphoto-wordpress
 Author: Randy Hoyt, Randy Jensen
-Author URI: http://cultivatr.com/
+Author URI: http://amesburyweb.com/
 Description: Connects a WordPress installation to an OpenPhoto installation.  
 */
 
@@ -30,7 +30,12 @@ class WP_OpenPhoto {
 	}	
 	
 	function media_render_openphoto_tab() {
-		media_upload_header();
+    	
+    	if ( $wp_version >= 3.5 ) {
+        	// do nothing
+        } else {
+    		media_upload_header();
+        }
 		
 		$post_id = intval($_REQUEST['post_id']);
 		$m = trim($_REQUEST['m']);
@@ -77,11 +82,11 @@ class WP_OpenPhoto {
 					caption_text = parent_el.find('.caption-text').val();
 					caption_text.replace(/'/g, '&#039;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 					url_text = parent_el.find('.url-text').val();
-					alignment = parent_el.find('.alignment-area input[type="radio"]]:checked').val();
-					size = parent_el.find('.size-area input[type="radio"]]:checked').val();
-					size_height = parent_el.find('.size-area input[type="radio"]]:checked').attr('data-image-height');
-					size_width = parent_el.find('.size-area input[type="radio"]]:checked').attr('data-image-width');
-					size_alt =  parent_el.find('.size-area input[type="radio"]]:checked').attr('alt');
+					alignment = parent_el.find('.alignment-area input[type="radio"]:checked').val();
+					size = parent_el.find('.size-area input[type="radio"]:checked').val();
+					size_height = parent_el.find('.size-area input[type="radio"]:checked').attr('data-image-height');
+					size_width = parent_el.find('.size-area input[type="radio"]:checked').attr('data-image-width');
+					size_alt =  parent_el.find('.size-area input[type="radio"]:checked').attr('alt');
 					size_class = 'size-' + size;
 					height = size_height;
 					width = size_width;