diff --git a/App Message Definitions b/App Message Definitions
index 369b766..22a7dea 160000
--- a/App Message Definitions	
+++ b/App Message Definitions	
@@ -1 +1 @@
-Subproject commit 369b76676bce4d37f4e19fa43f32e6e2e5dd3363
+Subproject commit 22a7deae6a9d2033f5d3bde4457e12e8543b9d10
diff --git a/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean+/b_BeanPlusLargeImgB.bin b/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean+/b_BeanPlusLargeImgB.bin
deleted file mode 100644
index 53c1951..0000000
Binary files a/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean+/b_BeanPlusLargeImgB.bin and /dev/null differ
diff --git a/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean+/b_BeanPlus_imgB_large.bin b/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean+/b_BeanPlus_imgB_large.bin
new file mode 100644
index 0000000..5b5cdc2
Binary files /dev/null and b/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean+/b_BeanPlus_imgB_large.bin differ
diff --git a/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean+/c_BeanPlusSmallImgA.bin b/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean+/c_BeanPlusSmallImgA.bin
index c404840..663a51b 100644
Binary files a/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean+/c_BeanPlusSmallImgA.bin and b/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean+/c_BeanPlusSmallImgA.bin differ
diff --git a/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean+/version.txt b/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean+/version.txt
index e2cb6fa..886135a 100644
--- a/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean+/version.txt	
+++ b/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean+/version.txt	
@@ -1 +1 @@
-201605240000
+201607260001
diff --git a/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean/a_BeanSmallImgAPadded.bin b/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean/a_BeanSmallImgAPadded.bin
index c3b6450..dad4acb 100644
Binary files a/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean/a_BeanSmallImgAPadded.bin and b/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean/a_BeanSmallImgAPadded.bin differ
diff --git a/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean/b_BeanLargeImgB.bin b/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean/b_Bean_imgB_large.bin
similarity index 82%
rename from Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean/b_BeanLargeImgB.bin
rename to Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean/b_Bean_imgB_large.bin
index 0b98234..2ce7aae 100644
Binary files a/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean/b_BeanLargeImgB.bin and b/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean/b_Bean_imgB_large.bin differ
diff --git a/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean/c_BeanSmallImgA.bin b/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean/c_BeanSmallImgA.bin
index 6025003..12b66b2 100644
Binary files a/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean/c_BeanSmallImgA.bin and b/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean/c_BeanSmallImgA.bin differ
diff --git a/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean/d_BeanSmallImgB.bin b/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean/d_BeanSmallImgB.bin
index e6ec4e5..912fb88 100644
Binary files a/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean/d_BeanSmallImgB.bin and b/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean/d_BeanSmallImgB.bin differ
diff --git a/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean/version.txt b/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean/version.txt
index e2cb6fa..5611cba 100644
--- a/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean/version.txt	
+++ b/Bean OSX Static Library/Bean OSX LibraryTests/Resources/Firmware Images/Bean/version.txt	
@@ -1 +1 @@
-201605240000
+201606030000
diff --git a/Bean-iOS-OSX-SDK.podspec b/Bean-iOS-OSX-SDK.podspec
index 1f75387..70f8144 100644
--- a/Bean-iOS-OSX-SDK.podspec
+++ b/Bean-iOS-OSX-SDK.podspec
@@ -2,7 +2,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "Bean-iOS-OSX-SDK"
-  s.version      = "2.1.0"
+  s.version      = "2.2.0"
   s.summary      = "Punch Through Design's SDK for speeding up development with the LightBlue Bean development platform"
   s.homepage     = "https://github.com/PunchThrough/Bean-iOS-OSX-SDK"
   s.license      = { :type => "MIT", :file => "LICENSE.txt" }
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 51bc5ac..933406a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -7,6 +7,28 @@
            __/ |                                  SDK for iOS and OS X
           |___/
 
+---------------------------------
+2.2.0
+Released on 2016-08-11
+---------------------------------
+App Message Definitions: master/22a7dea (2016-03-28)
+Bean Test Firmware: 201606030000 (2016-06-03)
+Bean+ Test Firmware: 201607260001 (2016-07-26)
+---------------------------------
+
+FEATURES:
+* Updated firmware for Bean and Bean+
+* Updated App Message Definitions
+
+IMPROVEMENTS:
+* Better sketch upload error messages
+* Deprecated [PTDBean eraseSketchWithHandler:]; use 
+  [PTDBean setArduinoPowerState:] instead
+
+BUG FIXES:
+* Fixed spelling errors in logging messages from Bean Manager
+* Fixed improper handling of certain completion blocks
+
 ---------------------------------
 2.1.0
 Released on 2016-05-26
diff --git a/firmware/201504270003_BEAN_imgA.bin b/firmware/201504270003_BEAN_imgA.bin
deleted file mode 100644
index b901b99..0000000
Binary files a/firmware/201504270003_BEAN_imgA.bin and /dev/null differ
diff --git a/firmware/201504270003_BEAN_imgB.bin b/firmware/201504270003_BEAN_imgB.bin
deleted file mode 100644
index df57a43..0000000
Binary files a/firmware/201504270003_BEAN_imgB.bin and /dev/null differ
diff --git a/firmware/Bean+/b_BeanPlus_imgB_large.bin b/firmware/Bean+/b_BeanPlus_imgB_large.bin
new file mode 100644
index 0000000..5b5cdc2
Binary files /dev/null and b/firmware/Bean+/b_BeanPlus_imgB_large.bin differ
diff --git a/firmware/Bean+/c_BeanPlusSmallImgA.bin b/firmware/Bean+/c_BeanPlusSmallImgA.bin
new file mode 100644
index 0000000..663a51b
Binary files /dev/null and b/firmware/Bean+/c_BeanPlusSmallImgA.bin differ
diff --git a/firmware/Bean+/version.txt b/firmware/Bean+/version.txt
new file mode 100644
index 0000000..886135a
--- /dev/null
+++ b/firmware/Bean+/version.txt
@@ -0,0 +1 @@
+201607260001
diff --git a/firmware/Bean/a_BeanSmallImgAPadded.bin b/firmware/Bean/a_BeanSmallImgAPadded.bin
new file mode 100644
index 0000000..dad4acb
Binary files /dev/null and b/firmware/Bean/a_BeanSmallImgAPadded.bin differ
diff --git a/firmware/Bean/b_Bean_imgB_large.bin b/firmware/Bean/b_Bean_imgB_large.bin
new file mode 100644
index 0000000..2ce7aae
Binary files /dev/null and b/firmware/Bean/b_Bean_imgB_large.bin differ
diff --git a/firmware/Bean/c_BeanSmallImgA.bin b/firmware/Bean/c_BeanSmallImgA.bin
new file mode 100644
index 0000000..12b66b2
Binary files /dev/null and b/firmware/Bean/c_BeanSmallImgA.bin differ
diff --git a/firmware/Bean/d_BeanSmallImgB.bin b/firmware/Bean/d_BeanSmallImgB.bin
new file mode 100644
index 0000000..912fb88
Binary files /dev/null and b/firmware/Bean/d_BeanSmallImgB.bin differ
diff --git a/firmware/Bean/version.txt b/firmware/Bean/version.txt
new file mode 100644
index 0000000..5611cba
--- /dev/null
+++ b/firmware/Bean/version.txt
@@ -0,0 +1 @@
+201606030000
diff --git a/source/PTDBean.m b/source/PTDBean.m
index bf0acd2..1af7342 100644
--- a/source/PTDBean.m
+++ b/source/PTDBean.m
@@ -31,6 +31,8 @@ @interface PTDBean () <CBPeripheralDelegate, AppMessagingLayerDelegate, OAD_Dele
 @property (nonatomic, readwrite) NSString *sketchName;
 @property (nonatomic, assign) NSInteger targetFirmwareVersion;
 @property (nonatomic, copy) void (^sketchErasedHandler)(BOOL sketchErased);
+@property (nonatomic, copy) void (^firmwareVersionAvailableHandler)(BOOL firmwareAvailable, NSError *error);
+@property (nonatomic, copy) void (^hardwareVersionAvailableHandler)(BOOL hardwareAvailable, NSError *error);
 
 @end
 
@@ -53,9 +55,6 @@ @implementation PTDBean
     BeanArduinoOADLocalState    localArduinoOADState;
     NSTimer*                    arduinoOADStateTimout;
     NSTimer*                    arduinoOADChunkSendTimer;
-    
-    void (^firmwareVersionAvailableHandler)(BOOL firmwareAvailable, NSError *error);
-    void (^hardwareVersionAvailableHandler)(BOOL hardwareAvailable, NSError *error);
     NSDate*                     firmwareUpdateStartTime;
         
 }
@@ -322,7 +321,7 @@ - (void)checkFirmwareVersionAvailableWithHandler:(void (^)(BOOL firmwareAvailabl
     if ( [self firmwareVersion] ) {
         handler( YES, nil );
     } else {
-        firmwareVersionAvailableHandler = handler;   // Wait until device info is valid
+        self.firmwareVersionAvailableHandler = handler;   // Wait until device info is valid
     }
 }
 
@@ -331,7 +330,7 @@ - (void)checkHardwareVersionAvailableWithHandler:(void (^)(BOOL hardwareAvailabl
     if ( [self hardwareVersion] ) {
         handler( YES, nil );
     } else {
-        hardwareVersionAvailableHandler = handler;   // Wait until device info is valid
+        self.hardwareVersionAvailableHandler = handler;   // Wait until device info is valid
     }
 }
 
@@ -365,6 +364,7 @@ - (void)cancelFirmwareUpdate{
     }
 }
 
+// Deprecated
 - (void)eraseSketchWithHandler:(void (^)(BOOL sketchErased))handler{
     
     if([self.sketchName isEqualToString:@""]) {
@@ -450,7 +450,7 @@ -(void)__setArduinoOADTimeout:(NSTimeInterval)duration{
     arduinoOADStateTimout = [NSTimer scheduledTimerWithTimeInterval:duration target:self selector:@selector(__arduinoOADTimeout:) userInfo:nil repeats:NO];
 }
 -(void)__arduinoOADTimeout:(NSTimer*)timer{
-    NSError* error = [BEAN_Helper basicError:@"Sketch upload failed!" domain:NSStringFromClass([self class]) code:0];
+    NSError* error = [BEAN_Helper basicError:@"Sketch upload failed: Arduino communication timed out" domain:NSStringFromClass([self class]) code:0];
     if (self.uploadInProgress) {
         [self __alertDelegateOfArduinoOADCompletion:error];
     }
@@ -516,7 +516,7 @@ -(void)__handleArduinoOADRemoteStateChange:(BL_HL_STATE_T)state{
             break;
         case BL_HL_STATE_ERROR:
         {
-            NSError *error = [BEAN_Helper basicError:@"Sketch upload failed!" domain:NSStringFromClass([self class]) code:0];
+            NSError *error = [BEAN_Helper basicError:@"Sketch upload failed: Bootloader error" domain:NSStringFromClass([self class]) code:0];
             if (self.uploadInProgress) {
                 [self __alertDelegateOfArduinoOADCompletion:error];
             }
@@ -926,9 +926,9 @@ -(void)batteryProfileDidUpdate
 
 - (void)hardwareVersionDidUpdate
 {
-    if (hardwareVersionAvailableHandler){
-        [self checkHardwareVersionAvailableWithHandler:hardwareVersionAvailableHandler];
-        hardwareVersionAvailableHandler = nil;
+    if (self.hardwareVersionAvailableHandler){
+        [self checkHardwareVersionAvailableWithHandler:self.hardwareVersionAvailableHandler];
+        self.hardwareVersionAvailableHandler = nil;
     }
 }
 
@@ -940,9 +940,9 @@ - (void)firmwareVersionDidUpdate
     // Don't send firmware version back to handler when firmware update is still in progress
     if (self.updateInProgress) return;
 
-    if (firmwareVersionAvailableHandler) {
-        [self checkFirmwareVersionAvailableWithHandler:firmwareVersionAvailableHandler];
-        firmwareVersionAvailableHandler = nil;
+    if (self.firmwareVersionAvailableHandler) {
+        [self checkFirmwareVersionAvailableWithHandler:self.firmwareVersionAvailableHandler];
+        self.firmwareVersionAvailableHandler = nil;
     }
 }
 
diff --git a/source/PTDBeanManager.m b/source/PTDBeanManager.m
index ce9c087..b82488a 100644
--- a/source/PTDBeanManager.m
+++ b/source/PTDBeanManager.m
@@ -125,20 +125,20 @@ -(void)connectToBean:(PTDBean*)bean_ withOptions:(NSDictionary*)options error:(N
     PTDBean* bean = [beanRecords objectForKey:bean_.identifier];
     //If there is no such peripheral, return error
     if(!bean){
-        if(error) *error = [BEAN_Helper basicError:@"Attemp to connect to Bean failed. No peripheral discovered with the corresponding UUID." domain:NSStringFromClass([self class]) code:BeanErrors_NoPeriphealDiscovered];
+        if(error) *error = [BEAN_Helper basicError:@"Attempt to connect to Bean failed. No peripheral discovered with the corresponding UUID." domain:NSStringFromClass([self class]) code:BeanErrors_NoPeriphealDiscovered];
         return;
     }
     //Check if the device is already connected
     else if(bean.state == BeanState_ConnectedAndValidated){
-        if(error) *error = [BEAN_Helper basicError:@"Attemp to connect to Bean failed. A device with this UUID is already connected" domain:NSStringFromClass([self class]) code:BeanErrors_AlreadyConnected];
+        if(error) *error = [BEAN_Helper basicError:@"Attempt to connect to Bean failed. A device with this UUID is already connected" domain:NSStringFromClass([self class]) code:BeanErrors_AlreadyConnected];
         return;
     }
     //Check if the device is already in the middle of an attempted connected
     else if(bean.state == BeanState_AttemptingConnection || bean.state == BeanState_AttemptingValidation){
-        if(error) *error = [BEAN_Helper basicError:@"Attemp to connect to Bean failed. A device with this UUID is in the process of being connected to." domain:NSStringFromClass([self class]) code:BeanErrors_AlreadyConnecting];
+        if(error) *error = [BEAN_Helper basicError:@"Attempt to connect to Bean failed. A device with this UUID is in the process of being connected to." domain:NSStringFromClass([self class]) code:BeanErrors_AlreadyConnecting];
         return;
     }else if(bean.state != BeanState_Discovered){
-        if(error) *error = [BEAN_Helper basicError:@"Attemp to connect to Bean failed. The device's current state is not eligible for a connection attempt." domain:NSStringFromClass([self class]) code:BeanErrors_DeviceNotEligible];
+        if(error) *error = [BEAN_Helper basicError:@"Attempt to connect to Bean failed. The device's current state is not eligible for a connection attempt." domain:NSStringFromClass([self class]) code:BeanErrors_DeviceNotEligible];
         return;
     }
     
@@ -164,7 +164,7 @@ -(void)disconnectBean:(PTDBean*)bean_ error:(NSError**)error
     PTDBean* bean = [beanRecords objectForKey:bean_.identifier];
     //Check if the device isn't currently connected
     if(!bean){
-        if(error) *error = [BEAN_Helper basicError:@"Failed attemp to disconnect Bean. No device with this UUID is currently connected" domain:NSStringFromClass([self class]) code:BeanErrors_FailedDisconnect];
+        if(error) *error = [BEAN_Helper basicError:@"Failed attempt to disconnect Bean. No device with this UUID is currently connected" domain:NSStringFromClass([self class]) code:BeanErrors_FailedDisconnect];
         return;
     }
     if(bean.peripheral.state != CBPeripheralStateConnected
@@ -206,7 +206,7 @@ -(void)bean:(PTDBean*)device hasBeenValidated_error:(NSError*)error{
     PTDBean* bean = [beanRecords objectForKey:[device identifier]];
     //If there is no such peripheral, return error
     if(!bean){
-        localError = [BEAN_Helper basicError:@"Attemp to connect to Bean failed. No peripheral discovered with the corresponding UUID." domain:NSStringFromClass([self class]) code:BeanErrors_NoPeriphealDiscovered];
+        localError = [BEAN_Helper basicError:@"Attempt to connect to Bean failed. No peripheral discovered with the corresponding UUID." domain:NSStringFromClass([self class]) code:BeanErrors_NoPeriphealDiscovered];
     }else if (error){
         localError = error;
         bean.state = BeanState_Discovered; // Reset bean state to the default, ready to connect
diff --git a/source/Public/PTDBean.h b/source/Public/PTDBean.h
index 3586437..648b17b 100644
--- a/source/Public/PTDBean.h
+++ b/source/Public/PTDBean.h
@@ -624,7 +624,7 @@ typedef NS_ENUM(NSUInteger, BeanBluetoothError) {
  *  Erases sketch with completion handler. Used to ensure sketch is cleared before updating from Sym. to Asym. FW
  *  @param The handler to run once the sketch name has been updated. The sketchErased bool indicates whether the erasure was successful or not.
  */
-- (void)eraseSketchWithHandler:(void (^)(BOOL sketchErased))handler;
+- (void)eraseSketchWithHandler:(void (^)(BOOL sketchErased))handler __attribute__((deprecated(("Use [setArduinoPowerState:] instead"))));
 
 @end