diff --git a/Source/DemoApp/Classes/DemoAppApplicationDelegate.h b/Source/DemoApp/Classes/DemoAppApplicationDelegate.h
index ae861e9..3f076f9 100644
--- a/Source/DemoApp/Classes/DemoAppApplicationDelegate.h
+++ b/Source/DemoApp/Classes/DemoAppApplicationDelegate.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MapKit.h>
+#import "MapKit.h"
 
 @class MKMapView;
 
diff --git a/Source/DemoApp/Classes/DemoAppApplicationDelegate.m b/Source/DemoApp/Classes/DemoAppApplicationDelegate.m
index 3c085d3..fb13003 100644
--- a/Source/DemoApp/Classes/DemoAppApplicationDelegate.m
+++ b/Source/DemoApp/Classes/DemoAppApplicationDelegate.m
@@ -8,7 +8,7 @@
 
 #import "DemoAppApplicationDelegate.h"
 #import <CoreLocation/CoreLocation.h>
-#import <MapKit/MapKit.h>
+#import "MapKit.h"
 
 @implementation DemoAppApplicationDelegate
 
diff --git a/Source/Framework/Classes/MKAnnotationView.h b/Source/Framework/Classes/MKAnnotationView.h
index f9bc632..a806a8a 100644
--- a/Source/Framework/Classes/MKAnnotationView.h
+++ b/Source/Framework/Classes/MKAnnotationView.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKView.h>
+#import "MKView.h"
 #import <WebKit/WebKit.h>
 
 enum {
diff --git a/Source/Framework/Classes/MKAnnotationView.m b/Source/Framework/Classes/MKAnnotationView.m
index 638fb44..ce84dbb 100644
--- a/Source/Framework/Classes/MKAnnotationView.m
+++ b/Source/Framework/Classes/MKAnnotationView.m
@@ -7,7 +7,7 @@
 //
 
 #import "MKAnnotationView.h"
-#import <MapKit/MKAnnotation.h>
+#import "MKAnnotation.h"
 
 
 
diff --git a/Source/Framework/Classes/MKCircle.h b/Source/Framework/Classes/MKCircle.h
index d1978c4..d5d4339 100644
--- a/Source/Framework/Classes/MKCircle.h
+++ b/Source/Framework/Classes/MKCircle.h
@@ -8,9 +8,9 @@
 
 #import <Cocoa/Cocoa.h>
 #import <CoreLocation/CoreLocation.h>
-#import <MapKit/MKShape.h>
-#import <MapKit/MKOverlay.h>
-#import <MapKit/MKGeometry.h>
+#import "MKShape.h"
+#import "MKOverlay.h"
+#import "MKGeometry.h"
 
 @interface MKCircle : MKShape <MKOverlay> {
     @package
diff --git a/Source/Framework/Classes/MKCircleView.h b/Source/Framework/Classes/MKCircleView.h
index 1eeee25..8cd42f3 100644
--- a/Source/Framework/Classes/MKCircleView.h
+++ b/Source/Framework/Classes/MKCircleView.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKOverlayPathView.h>
+#import "MKOverlayPathView.h"
 
 @class MKCircle;
 
diff --git a/Source/Framework/Classes/MKCircleView.m b/Source/Framework/Classes/MKCircleView.m
index e5607be..214a401 100644
--- a/Source/Framework/Classes/MKCircleView.m
+++ b/Source/Framework/Classes/MKCircleView.m
@@ -7,7 +7,7 @@
 //
 
 #import "MKCircleView.h"
-#import <MapKit/MKCircle.h>
+#import "MKCircle.h"
 
 @implementation MKCircleView
 
diff --git a/Source/Framework/Classes/MKGeocoder.h b/Source/Framework/Classes/MKGeocoder.h
index ac1f903..cbba21e 100644
--- a/Source/Framework/Classes/MKGeocoder.h
+++ b/Source/Framework/Classes/MKGeocoder.h
@@ -9,7 +9,7 @@
 #import <Cocoa/Cocoa.h>
 #import <CoreLocation/CLLocation.h>
 #import <WebKit/WebKit.h>
-#import <MapKit/MKTypes.h>
+#import "MKTypes.h"
 
 @protocol MKGeocoderDelegate;
 
diff --git a/Source/Framework/Classes/MKMapView+Additions.h b/Source/Framework/Classes/MKMapView+Additions.h
index d57c8e8..4377998 100644
--- a/Source/Framework/Classes/MKMapView+Additions.h
+++ b/Source/Framework/Classes/MKMapView+Additions.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKMapView.h>
+#import "MKMapView.h"
 
 @interface MKMapView (Additions)
 
diff --git a/Source/Framework/Classes/MKMapView+DelegateWrappers.h b/Source/Framework/Classes/MKMapView+DelegateWrappers.h
index a2ae312..2eac80d 100644
--- a/Source/Framework/Classes/MKMapView+DelegateWrappers.h
+++ b/Source/Framework/Classes/MKMapView+DelegateWrappers.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKMapView.h>
+#import "MKMapView.h"
 
 @interface MKMapView (DelegateWrappers)
 
diff --git a/Source/Framework/Classes/MKMapView+Private.m b/Source/Framework/Classes/MKMapView+Private.m
index e5d6534..d08b16d 100644
--- a/Source/Framework/Classes/MKMapView+Private.m
+++ b/Source/Framework/Classes/MKMapView+Private.m
@@ -34,14 +34,14 @@ - (void)customInit
 	
     // Create the overlay data structures
     overlays = [[NSMutableArray array] retain];
-    overlayViews = [[NSMapTable mapTableWithStrongToStrongObjects] retain];
-    overlayScriptObjects = [[NSMapTable mapTableWithStrongToStrongObjects] retain];
+    overlayViews = [[NSMapTable strongToStrongObjectsMapTable] retain];
+    overlayScriptObjects = [[NSMapTable strongToStrongObjectsMapTable] retain];
     
     // Create the annotation data structures
     annotations = [[NSMutableArray array] retain];
     selectedAnnotations = [[NSMutableArray array] retain];
-    annotationViews = [[NSMapTable mapTableWithStrongToStrongObjects] retain];
-    annotationScriptObjects = [[NSMapTable mapTableWithStrongToStrongObjects] retain];
+    annotationViews = [[NSMapTable strongToStrongObjectsMapTable] retain];
+    annotationScriptObjects = [[NSMapTable strongToStrongObjectsMapTable] retain];
     
     [self loadMapKitHtml];
     
diff --git a/Source/Framework/Classes/MKMapView+WebViewIntegration.h b/Source/Framework/Classes/MKMapView+WebViewIntegration.h
index e577ce8..6ad0ac0 100644
--- a/Source/Framework/Classes/MKMapView+WebViewIntegration.h
+++ b/Source/Framework/Classes/MKMapView+WebViewIntegration.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKMapView.h>
+#import "MKMapView.h"
 
 @interface MKMapView (WebViewIntegration)
 
diff --git a/Source/Framework/Classes/MKMapView.h b/Source/Framework/Classes/MKMapView.h
index c621335..b96b2a9 100644
--- a/Source/Framework/Classes/MKMapView.h
+++ b/Source/Framework/Classes/MKMapView.h
@@ -9,10 +9,10 @@
 #import <Cocoa/Cocoa.h>
 #import <WebKit/WebKit.h>
 #import <CoreLocation/CoreLocation.h>
-#import <MapKit/MKTypes.h>
-#import <MapKit/MKGeometry.h>
-#import <MapKit/MKOverlay.h>
-#import <MapKit/MKAnnotationView.h>
+#import "MKTypes.h"
+#import "MKGeometry.h"
+#import "MKOverlay.h"
+#import "MKAnnotationView.h"
 
 @protocol MKMapViewDelegate;
 @class MKUserLocation;
diff --git a/Source/Framework/Classes/MKMapView.m b/Source/Framework/Classes/MKMapView.m
index 7193020..fe38f39 100644
--- a/Source/Framework/Classes/MKMapView.m
+++ b/Source/Framework/Classes/MKMapView.m
@@ -9,14 +9,14 @@
 #import "MKMapView.h"
 #import "MKMapView+Private.h"
 #import "JSON.h"
-#import <MapKit/MKUserLocation.h>
+#import "MKUserLocation.h"
 #import "MKUserLocation+Private.h"
-#import <MapKit/MKCircleView.h>
-#import <MapKit/MKCircle.h>
-#import <MapKit/MKPolyline.h>
-#import <MapKit/MKPolygon.h>
-#import <MapKit/MKAnnotationView.h>
-#import <MapKit/MKPointAnnotation.h>
+#import "MKCircleView.h"
+#import "MKCircle.h"
+#import "MKPolyline.h"
+#import "MKPolygon.h"
+#import "MKAnnotationView.h"
+#import "MKPointAnnotation.h"
 #import "MKMapView+DelegateWrappers.h"
 #import "MKMapView+WebViewIntegration.h"
 #import "MKWebView.h"
@@ -60,7 +60,6 @@ - (void)dealloc
     [webView setFrameLoadDelegate:nil];
     delegate = nil;
     [webView removeFromSuperview];
-    [webView autorelease];
     [locationManager stopUpdatingLocation];
     [locationManager release];
     [userLocation release];
@@ -136,6 +135,9 @@ - (MKCoordinateRegion)region
 {
     WebScriptObject *webScriptObject = [webView windowScriptObject];
     NSString *json = [webScriptObject evaluateWebScript:@"getRegion()"];
+    if (![json isKindOfClass:[NSString class]]) {
+        return MKCoordinateRegionMake(CLLocationCoordinate2DMake(0, 0), MKCoordinateSpanMake(0, 0));
+    }
     NSDictionary *regionDict = [json JSONValue];
     
     NSNumber *centerLatitude = [regionDict valueForKeyPath:@"center.latitude"];
diff --git a/Source/Framework/Classes/MKMultiPoint.h b/Source/Framework/Classes/MKMultiPoint.h
index d114b6f..d4fab25 100644
--- a/Source/Framework/Classes/MKMultiPoint.h
+++ b/Source/Framework/Classes/MKMultiPoint.h
@@ -7,9 +7,9 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKShape.h>
-#import <MapKit/MKGeometry.h>
-#import <MapKit/MKTypes.h>
+#import "MKShape.h"
+#import "MKGeometry.h"
+#import "MKTypes.h"
 
 @interface MKMultiPoint : MKShape {
     CLLocationCoordinate2D *coordinates;
diff --git a/Source/Framework/Classes/MKOverlay.h b/Source/Framework/Classes/MKOverlay.h
index 28ac2e0..ff464f7 100644
--- a/Source/Framework/Classes/MKOverlay.h
+++ b/Source/Framework/Classes/MKOverlay.h
@@ -7,9 +7,9 @@
  *
  */
 
-#import <MapKit/MKAnnotation.h>
-#import <MapKit/MKTypes.h>
-#import <MapKit/MKGeometry.h>
+#import "MKAnnotation.h"
+#import "MKTypes.h"
+#import "MKGeometry.h"
 
 
 @protocol MKOverlay <MKAnnotation>
diff --git a/Source/Framework/Classes/MKOverlayPathView.h b/Source/Framework/Classes/MKOverlayPathView.h
index 79d4ef6..47bb90e 100644
--- a/Source/Framework/Classes/MKOverlayPathView.h
+++ b/Source/Framework/Classes/MKOverlayPathView.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKOverlayView.h>
+#import "MKOverlayView.h"
 
 @interface MKOverlayPathView : MKOverlayView {
     NSColor *fillColor;
diff --git a/Source/Framework/Classes/MKOverlayView.h b/Source/Framework/Classes/MKOverlayView.h
index 1a26d12..85e4036 100644
--- a/Source/Framework/Classes/MKOverlayView.h
+++ b/Source/Framework/Classes/MKOverlayView.h
@@ -7,8 +7,8 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKOverlay.h>
-#import <MapKit/MKView.h>
+#import "MKOverlay.h"
+#import "MKView.h"
 
 @interface MKOverlayView : MKView {
     id <MKOverlay> overlay;
diff --git a/Source/Framework/Classes/MKPinAnnotationView.h b/Source/Framework/Classes/MKPinAnnotationView.h
index b0c2972..bad3e3f 100644
--- a/Source/Framework/Classes/MKPinAnnotationView.h
+++ b/Source/Framework/Classes/MKPinAnnotationView.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKAnnotationView.h>
+#import "MKAnnotationView.h"
 
 enum {
     MKPinAnnotationColorRed = 0,
diff --git a/Source/Framework/Classes/MKPinAnnotationView.m b/Source/Framework/Classes/MKPinAnnotationView.m
index a59547e..8d64825 100644
--- a/Source/Framework/Classes/MKPinAnnotationView.m
+++ b/Source/Framework/Classes/MKPinAnnotationView.m
@@ -46,4 +46,13 @@ - (NSString *)imageUrl
     return [url absoluteString];
 }
 
+
+- (NSDictionary *)options {
+    NSMutableDictionary* mutableOptions = [[super options] mutableCopy];
+
+    [mutableOptions setObject:[NSNumber numberWithBool:animatesDrop] forKey:@"dropAnimation"];
+
+    return [[mutableOptions copy] autorelease];
+}
+
 @end
diff --git a/Source/Framework/Classes/MKPlacemark+Private.h b/Source/Framework/Classes/MKPlacemark+Private.h
index 0df7fee..1a92cf8 100644
--- a/Source/Framework/Classes/MKPlacemark+Private.h
+++ b/Source/Framework/Classes/MKPlacemark+Private.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKPlacemark.h>
+#import "MKPlacemark.h"
 
 @interface MKPlacemark (Private)
 
diff --git a/Source/Framework/Classes/MKPlacemark.h b/Source/Framework/Classes/MKPlacemark.h
index d8bb6d2..ed60bcb 100644
--- a/Source/Framework/Classes/MKPlacemark.h
+++ b/Source/Framework/Classes/MKPlacemark.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKAnnotation.h>
+#import "MKAnnotation.h"
 #import <CoreLocation/CLLocation.h>
 
 @interface MKPlacemark : NSObject <MKAnnotation> {
diff --git a/Source/Framework/Classes/MKPointAnnotation.h b/Source/Framework/Classes/MKPointAnnotation.h
index 6b09ed5..0959f47 100644
--- a/Source/Framework/Classes/MKPointAnnotation.h
+++ b/Source/Framework/Classes/MKPointAnnotation.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKShape.h>
+#import "MKShape.h"
 #import <CoreLocation/CLLocation.h>
 
 @interface MKPointAnnotation : MKShape {
diff --git a/Source/Framework/Classes/MKPolygon.h b/Source/Framework/Classes/MKPolygon.h
index 48eee66..2f16e40 100644
--- a/Source/Framework/Classes/MKPolygon.h
+++ b/Source/Framework/Classes/MKPolygon.h
@@ -7,8 +7,8 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKMultiPoint.h>
-#import <MapKit/MKOverlay.h>
+#import "MKMultiPoint.h"
+#import "MKOverlay.h"
 
 @interface MKPolygon : MKMultiPoint <MKOverlay> {
     NSArray *interiorPolygons;
diff --git a/Source/Framework/Classes/MKPolygonView.h b/Source/Framework/Classes/MKPolygonView.h
index be67131..f0815c9 100644
--- a/Source/Framework/Classes/MKPolygonView.h
+++ b/Source/Framework/Classes/MKPolygonView.h
@@ -7,8 +7,8 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKPolygon.h>
-#import <MapKit/MKOverlayPathView.h>
+#import "MKPolygon.h"
+#import "MKOverlayPathView.h"
 
 @interface MKPolygonView : MKOverlayPathView{
     NSArray *path;
diff --git a/Source/Framework/Classes/MKPolyline.h b/Source/Framework/Classes/MKPolyline.h
index f9eb80b..a575e68 100644
--- a/Source/Framework/Classes/MKPolyline.h
+++ b/Source/Framework/Classes/MKPolyline.h
@@ -7,8 +7,8 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKMultiPoint.h>
-#import <MapKit/MKOverlay.h>
+#import "MKMultiPoint.h"
+#import "MKOverlay.h"
 
 @interface MKPolyline : MKMultiPoint <MKOverlay>
 
diff --git a/Source/Framework/Classes/MKPolylineView.h b/Source/Framework/Classes/MKPolylineView.h
index ed011ab..47852b8 100644
--- a/Source/Framework/Classes/MKPolylineView.h
+++ b/Source/Framework/Classes/MKPolylineView.h
@@ -7,8 +7,8 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKPolyline.h>
-#import <MapKit/MKOverlayPathView.h>
+#import "MKPolyline.h"
+#import "MKOverlayPathView.h"
 
 @interface MKPolylineView : MKOverlayPathView {
     NSArray *path;
diff --git a/Source/Framework/Classes/MKReverseGeocoder.h b/Source/Framework/Classes/MKReverseGeocoder.h
index e75d93c..068a149 100644
--- a/Source/Framework/Classes/MKReverseGeocoder.h
+++ b/Source/Framework/Classes/MKReverseGeocoder.h
@@ -9,7 +9,7 @@
 #import <Cocoa/Cocoa.h>
 #import <CoreLocation/CLLocation.h>
 #import <WebKit/WebKit.h>
-#import <MapKit/MKTypes.h>
+#import "MKTypes.h"
 
 @class MKPlacemark;
 @protocol MKReverseGeocoderDelegate;
diff --git a/Source/Framework/Classes/MKShape.h b/Source/Framework/Classes/MKShape.h
index 664b2d4..6dfa241 100644
--- a/Source/Framework/Classes/MKShape.h
+++ b/Source/Framework/Classes/MKShape.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKAnnotation.h>
+#import "MKAnnotation.h"
 
 @interface MKShape : NSObject <MKAnnotation> {
     @package
diff --git a/Source/Framework/Classes/MKUserLocation+Private.h b/Source/Framework/Classes/MKUserLocation+Private.h
index 4c9cd7f..a9394b9 100644
--- a/Source/Framework/Classes/MKUserLocation+Private.h
+++ b/Source/Framework/Classes/MKUserLocation+Private.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKUserLocation.h>
+#import "MKUserLocation.h"
 
 @class CLLocation;
 
diff --git a/Source/Framework/Classes/MKUserLocation.h b/Source/Framework/Classes/MKUserLocation.h
index 2d804b1..52286c4 100644
--- a/Source/Framework/Classes/MKUserLocation.h
+++ b/Source/Framework/Classes/MKUserLocation.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKAnnotation.h>
+#import "MKAnnotation.h"
 
 @class CLLocation;
 
diff --git a/Source/Framework/Classes/MapKit.h b/Source/Framework/Classes/MapKit.h
index 1c39c59..e41a46b 100644
--- a/Source/Framework/Classes/MapKit.h
+++ b/Source/Framework/Classes/MapKit.h
@@ -7,27 +7,27 @@
  *
  */
 
-#import <MapKit/MKMapView.h>
-#import <MapKit/MKMapView+Additions.h>
-#import <MapKit/MKTypes.h>
-#import <MapKit/MKGeometry.h>
-#import <MapKit/MKUserLocation.h>
-#import <MapKit/MKOverlay.h>
-#import <MapKit/MKShape.h>
-#import <MapKit/MKCircle.h>
-#import <MapKit/MKOverlayView.h>
-#import <MapKit/MKOverlayPathView.h>
-#import <MapKit/MKCircleView.h>
-#import <MapKit/MKMultiPoint.h>
-#import <MapKit/MKPolyline.h>
-#import <MapKit/MKPolylineView.h>
-#import <MapKit/MKPolygon.h>
-#import <MapKit/MKPolygonView.h>
-#import <MapKit/MKView.h>
-#import <MapKit/MKAnnotationView.h>
-#import <MapKit/MKPinAnnotationView.h>
-#import <MapKit/MKPointAnnotation.h>
-#import <MapKit/MKReverseGeocoder.h>
-#import <MapKit/MKGeocoder.h>
-#import <MapKit/MKPlacemark.h>
+#import "MKMapView.h"
+#import "MKMapView+Additions.h"
+#import "MKTypes.h"
+#import "MKGeometry.h"
+#import "MKUserLocation.h"
+#import "MKOverlay.h"
+#import "MKShape.h"
+#import "MKCircle.h"
+#import "MKOverlayView.h"
+#import "MKOverlayPathView.h"
+#import "MKCircleView.h"
+#import "MKMultiPoint.h"
+#import "MKPolyline.h"
+#import "MKPolylineView.h"
+#import "MKPolygon.h"
+#import "MKPolygonView.h"
+#import "MKView.h"
+#import "MKAnnotationView.h"
+#import "MKPinAnnotationView.h"
+#import "MKPointAnnotation.h"
+#import "MKReverseGeocoder.h"
+#import "MKGeocoder.h"
+#import "MKPlacemark.h"
 
diff --git a/Source/Framework/Resources/MapKit.html b/Source/Framework/Resources/MapKit.html
index 4076126..8a241f8 100644
--- a/Source/Framework/Resources/MapKit.html
+++ b/Source/Framework/Resources/MapKit.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
-<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=true&v=3.6"></script>
+<script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=true&v=3.6"></script>
 
 <style type="text/css">
 
@@ -137,6 +137,7 @@
     this.div_ = null;
     this.imageUrl_ = null;
     this.imageTag_ = null;
+    this.dropAnimation = true; // Assume we always want drop animation
     this.marker_ = null;
     this.calloutWrapper_ = null;
     this.calloutCanvas_ = null;
@@ -208,6 +209,10 @@
               if (annotation.calloutWrapper_)
                 annotation.calloutWrapper_.style.zIndex = value;
           }
+          else if (option == "dropAnimation")
+          {
+              annotation.dropAnimation = value;
+          }
       }
   }
   
@@ -432,12 +437,12 @@
     // the map's panes are now available for attaching
     // the overlay to the map via the DOM.
     var me = this;
-    
-
 
     // Create the DIV and set some basic attributes.
     var div = document.createElement('DIV');
-    div.className = "dropAnimation";
+    if (me.dropAnimation) {
+      div.className = "dropAnimation";
+    }
     div.style.borderStyle = "none";
     div.style.borderWidth = "0px";
     div.style.position = "absolute";
diff --git a/Source/IBPlugin/Classes/MKMapView+MapKitPlugin.m b/Source/IBPlugin/Classes/MKMapView+MapKitPlugin.m
index 6f96598..8583a76 100644
--- a/Source/IBPlugin/Classes/MKMapView+MapKitPlugin.m
+++ b/Source/IBPlugin/Classes/MKMapView+MapKitPlugin.m
@@ -7,7 +7,7 @@
 //
 
 #import <InterfaceBuilderKit/InterfaceBuilderKit.h>
-#import <MapKit/MKMapView.h>
+#import "MKMapView.h"
 #import "MKMapViewAttributeInspector.h"
 
 @implementation MKMapView ( MapKitPlugin )
diff --git a/Source/MapKit.xcodeproj/project.pbxproj b/Source/MapKit.xcodeproj/project.pbxproj
index d869d5b..c09f927 100644
--- a/Source/MapKit.xcodeproj/project.pbxproj
+++ b/Source/MapKit.xcodeproj/project.pbxproj
@@ -738,7 +738,7 @@
 		0867D690FE84028FC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0420;
+				LastUpgradeCheck = 0720;
 			};
 			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "MapKit" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -882,7 +882,6 @@
 		1DEB91B208733DA50010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -895,7 +894,6 @@
 		1DEB91B308733DA50010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
@@ -907,6 +905,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_GC = required;
@@ -931,6 +930,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_ENABLE_OBJC_GC = required;
@@ -955,6 +955,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -965,7 +966,6 @@
 				);
 				FRAMEWORK_VERSION = A;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_GC = supported;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -986,6 +986,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -996,7 +997,6 @@
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
 				);
 				FRAMEWORK_VERSION = A;
-				GCC_ENABLE_OBJC_GC = supported;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
@@ -1017,6 +1017,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = YES;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1046,6 +1047,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = YES;
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = (