diff --git a/libraries/Bridge/examples/SpacebrewYun/inputOutput/inputOutput.ino b/libraries/Bridge/examples/SpacebrewYun/inputOutput/inputOutput.ino
index e566be34a..5d49bba98 100644
--- a/libraries/Bridge/examples/SpacebrewYun/inputOutput/inputOutput.ino
+++ b/libraries/Bridge/examples/SpacebrewYun/inputOutput/inputOutput.ino
@@ -2,23 +2,23 @@
   Input Output
 
  Demonstrates how to create a sketch that sends and receives all standard
- spacebrew data types, and a custom data type. Every time data is
+ spacebrew data types, and a custom data type. Every time data is 
  received it is output to the Serial monitor.
 
- Make sure that your Yun is connected to the internet for this example
+ Make sure that your Yun is connected to the internet for this example 
  to function properly.
-
+ 
  The circuit:
  - No circuit required
-
+ 
  created 2013
  by Julio Terra
-
+ 
  This example code is in the public domain.
-
- More information about Spacebrew is available at:
+ 
+ More information about Spacebrew is available at: 
  http://spacebrew.cc/
-
+ 
  */
 
 #include <Bridge.h>
@@ -33,100 +33,100 @@ int interval = 2000;
 
 int counter = 0;
 
-void setup() {
+void setup() { 
 
-  // start the serial port
-  Serial.begin(57600);
+	// start the serial port
+	Serial.begin(57600);
 
-  // for debugging, wait until a serial console is connected
-  delay(4000);
-  while (!Serial) {
-    ;
-  }
+	// for debugging, wait until a serial console is connected
+	delay(4000);
+	while (!Serial) { ; }
 
-  // start-up the bridge
-  Bridge.begin();
+	// start-up the bridge
+	Bridge.begin();
 
-  // configure the spacebrew object to print status messages to serial
-  sb.verbose(true);
+	// configure the spacebrew object to print status messages to serial
+	sb.verbose(true);
 
-  // configure the spacebrew publisher and subscriber
-  sb.addPublish("string test", "string");
-  sb.addPublish("range test", "range");
-  sb.addPublish("boolean test", "boolean");
-  sb.addPublish("custom test", "crazy");
-  sb.addSubscribe("string test", "string");
-  sb.addSubscribe("range test", "range");
-  sb.addSubscribe("boolean test", "boolean");
-  sb.addSubscribe("custom test", "crazy");
+	// configure the spacebrew publisher and subscriber
+	sb.addPublish("string test", "string");
+	sb.addPublish("range test", "range");
+	sb.addPublish("boolean test", "boolean");
+	sb.addPublish("custom test", "crazy");
+	sb.addSubscribe("string test", "string");
+	sb.addSubscribe("range test", "range");
+	sb.addSubscribe("boolean test", "boolean");
+	sb.addSubscribe("custom test", "crazy");
 
-  // register the string message handler method
-  sb.onRangeMessage(handleRange);
-  sb.onStringMessage(handleString);
-  sb.onBooleanMessage(handleBoolean);
-  sb.onCustomMessage(handleCustom);
+	// register the string message handler method 
+	sb.onRangeMessage(handleRange);
+	sb.onStringMessage(handleString);
+	sb.onBooleanMessage(handleBoolean);
+	sb.onCustomMessage(handleCustom);
 
-  // connect to cloud spacebrew server at "sandbox.spacebrew.cc"
-  sb.connect("sandbox.spacebrew.cc");
-
-}
+	// connect to cloud spacebrew server at "sandbox.spacebrew.cc"
+	sb.connect("sandbox.spacebrew.cc"); 
+	// we give some time to arduino to connect to sandbox, otherwise the first sb.monitor(); call will give an error
+	delay(1000);
+} 
 
 
-void loop() {
-  // monitor spacebrew connection for new data
-  sb.monitor();
+void loop() { 
+	// monitor spacebrew connection for new data
+	sb.monitor();
 
-  // connected to spacebrew then send a string every 2 seconds
-  if ( sb.connected() ) {
+	// connected to spacebrew then send a string every 2 seconds
+	if ( sb.connected() ) {
 
-    // check if it is time to send a new message
-    if ( (millis() - last) > interval ) {
-      String test_str_msg = "testing, testing, ";
-      test_str_msg += counter;
-      counter ++;
+		// check if it is time to send a new message
+		if ( (millis() - last) > interval ) {
+			String test_str_msg = "testing, testing, ";
+			test_str_msg += counter;
+			counter ++;
 
-      sb.send("string test", test_str_msg);
-      sb.send("range test", 500);
-      sb.send("boolean test", true);
-      sb.send("custom test", "youre loco");
+			sb.send("string test", test_str_msg);
+			sb.send("range test", 500);
+			sb.send("boolean test", true);
+			sb.send("custom test", "youre loco");
 
-      last = millis();
+			last = millis();
 
-    }
-  }
-}
+		}
+	}
+	delay(1000);
+} 
 
 // define handler methods, all standard data type handlers take two appropriate arguments
 
 void handleRange (String route, int value) {
-  Serial.print("Range msg ");
-  Serial.print(route);
-  Serial.print(", value ");
-  Serial.println(value);
+	Serial.print("Range msg ");
+	Serial.print(route);
+	Serial.print(", value ");
+	Serial.println(value);
 }
 
 void handleString (String route, String value) {
-  Serial.print("String msg ");
-  Serial.print(route);
-  Serial.print(", value ");
-  Serial.println(value);
+	Serial.print("String msg ");
+	Serial.print(route);
+	Serial.print(", value ");
+	Serial.println(value);
 }
 
 void handleBoolean (String route, boolean value) {
-  Serial.print("Boolen msg ");
-  Serial.print(route);
-  Serial.print(", value ");
-  Serial.println(value ? "true" : "false");
+	Serial.print("Boolen msg ");
+	Serial.print(route);
+	Serial.print(", value ");
+	Serial.println(value ? "true" : "false");
 }
 
 // custom data type handlers takes three String arguments
 
 void handleCustom (String route, String value, String type) {
-  Serial.print("Custom msg ");
-  Serial.print(route);
-  Serial.print(" of type ");
-  Serial.print(type);
-  Serial.print(", value ");
-  Serial.println(value);
+	Serial.print("Custom msg ");
+	Serial.print(route);
+	Serial.print(" of type ");
+	Serial.print(type);
+	Serial.print(", value ");
+	Serial.println(value);
 }
 
diff --git a/libraries/Bridge/examples/SpacebrewYun/spacebrewBoolean/spacebrewBoolean.ino b/libraries/Bridge/examples/SpacebrewYun/spacebrewBoolean/spacebrewBoolean.ino
index 3dc0e9285..0f068aa06 100644
--- a/libraries/Bridge/examples/SpacebrewYun/spacebrewBoolean/spacebrewBoolean.ino
+++ b/libraries/Bridge/examples/SpacebrewYun/spacebrewBoolean/spacebrewBoolean.ino
@@ -1,26 +1,26 @@
 /*
   Spacebrew Boolean
-
+ 
  Demonstrates how to create a sketch that sends and receives a
- boolean value to and from Spacebrew. Every time the buttton is
- pressed (or other digital input component) a spacebrew message
- is sent. The sketch also accepts analog range messages from
+ boolean value to and from Spacebrew. Every time the buttton is 
+ pressed (or other digital input component) a spacebrew message 
+ is sent. The sketch also accepts analog range messages from 
  other Spacebrew apps.
 
- Make sure that your Yun is connected to the internet for this example
+ Make sure that your Yun is connected to the internet for this example 
  to function properly.
-
+ 
  The circuit:
  - Button connected to Yun, using the Arduino's internal pullup resistor.
-
+ 
  created 2013
  by Julio Terra
-
+ 
  This example code is in the public domain.
-
- More information about Spacebrew is available at:
+ 
+ More information about Spacebrew is available at: 
  http://spacebrew.cc/
-
+ 
  */
 
 #include <Bridge.h>
@@ -33,59 +33,57 @@ SpacebrewYun sb = SpacebrewYun("spacebrewYun Boolean", "Boolean sender and recei
 int last_value = 0;
 
 // create variables to manage interval between each time we send a string
-void setup() {
+void setup() { 
 
-  // start the serial port
-  Serial.begin(57600);
+	// start the serial port
+	Serial.begin(57600);
 
-  // for debugging, wait until a serial console is connected
-  delay(4000);
-  while (!Serial) {
-    ;
-  }
+	// for debugging, wait until a serial console is connected
+	delay(4000);
+	while (!Serial) { ; }
 
-  // start-up the bridge
-  Bridge.begin();
+	// start-up the bridge
+	Bridge.begin();
 
-  // configure the spacebrew object to print status messages to serial
-  sb.verbose(true);
+	// configure the spacebrew object to print status messages to serial
+	sb.verbose(true);
 
-  // configure the spacebrew publisher and subscriber
-  sb.addPublish("physical button", "boolean");
-  sb.addSubscribe("virtual button", "boolean");
+	// configure the spacebrew publisher and subscriber
+	sb.addPublish("physical button", "boolean");
+	sb.addSubscribe("virtual button", "boolean");
 
-  // register the string message handler method
-  sb.onBooleanMessage(handleBoolean);
+	// register the string message handler method 
+	sb.onBooleanMessage(handleBoolean);
 
-  // connect to cloud spacebrew server at "sandbox.spacebrew.cc"
-  sb.connect("sandbox.spacebrew.cc");
+	// connect to cloud spacebrew server at "sandbox.spacebrew.cc"
+	sb.connect("sandbox.spacebrew.cc"); 
 
-  pinMode(3, INPUT);
-  digitalWrite(3, HIGH);
-}
+	pinMode(3, INPUT);
+	digitalWrite(3, HIGH);
+} 
 
 
-void loop() {
-  // monitor spacebrew connection for new data
-  sb.monitor();
+void loop() { 
+	// monitor spacebrew connection for new data
+	sb.monitor();
 
-  // connected to spacebrew then send a new value whenever the pot value changes
-  if ( sb.connected() ) {
-    int cur_value = digitalRead(3);
-    if ( last_value != cur_value ) {
-      if (cur_value == HIGH) sb.send("physical button", false);
-      else sb.send("physical button", true);
-      last_value = cur_value;
-    }
-  }
-}
+	// connected to spacebrew then send a new value whenever the pot value changes
+	if ( sb.connected() ) {
+		int cur_value = digitalRead(3);
+		if ( last_value != cur_value ) {
+			if (cur_value == HIGH) sb.send("physical button", false);
+			else sb.send("physical button", true);
+			last_value = cur_value;
+		}
+	}
+} 
 
-// handler method that is called whenever a new string message is received
+// handler method that is called whenever a new string message is received 
 void handleBoolean (String route, boolean value) {
-  // print the message that was received
-  Serial.print("From ");
-  Serial.print(route);
-  Serial.print(", received msg: ");
-  Serial.println(value ? "true" : "false");
+	// print the message that was received
+	Serial.print("From ");
+	Serial.print(route);
+	Serial.print(", received msg: ");
+	Serial.println(value ? "true" : "false");
 }
 
diff --git a/libraries/Bridge/examples/SpacebrewYun/spacebrewRange/spacebrewRange.ino b/libraries/Bridge/examples/SpacebrewYun/spacebrewRange/spacebrewRange.ino
index 3e18e3471..6dcbff8bf 100644
--- a/libraries/Bridge/examples/SpacebrewYun/spacebrewRange/spacebrewRange.ino
+++ b/libraries/Bridge/examples/SpacebrewYun/spacebrewRange/spacebrewRange.ino
@@ -1,27 +1,27 @@
 /*
   Spacebrew Range
-
+ 
  Demonstrates how to create a sketch that sends and receives analog
- range value to and from Spacebrew. Every time the state of the
+ range value to and from Spacebrew. Every time the state of the 
  potentiometer (or other analog input component) change a spacebrew
- message is sent. The sketch also accepts analog range messages from
+ message is sent. The sketch also accepts analog range messages from 
  other Spacebrew apps.
 
- Make sure that your Yun is connected to the internet for this example
+ Make sure that your Yun is connected to the internet for this example 
  to function properly.
-
+ 
  The circuit:
- - Potentiometer connected to Yun. Middle pin connected to analog pin A0,
+ - Potentiometer connected to Yun. Middle pin connected to analog pin A0, 
    other pins connected to 5v and GND pins.
-
+ 
  created 2013
  by Julio Terra
-
+ 
  This example code is in the public domain.
-
- More information about Spacebrew is available at:
+ 
+ More information about Spacebrew is available at: 
  http://spacebrew.cc/
-
+ 
  */
 
 #include <Bridge.h>
@@ -34,55 +34,53 @@ SpacebrewYun sb = SpacebrewYun("spacebrewYun Range", "Range sender and receiver"
 int last_value = 0;
 
 // create variables to manage interval between each time we send a string
-void setup() {
+void setup() { 
 
-  // start the serial port
-  Serial.begin(57600);
+	// start the serial port
+	Serial.begin(57600);
 
-  // for debugging, wait until a serial console is connected
-  delay(4000);
-  while (!Serial) {
-    ;
-  }
+	// for debugging, wait until a serial console is connected
+	delay(4000);
+	while (!Serial) { ; }
 
-  // start-up the bridge
-  Bridge.begin();
+	// start-up the bridge
+	Bridge.begin();
 
-  // configure the spacebrew object to print status messages to serial
-  sb.verbose(true);
+	// configure the spacebrew object to print status messages to serial
+	sb.verbose(true);
 
-  // configure the spacebrew publisher and subscriber
-  sb.addPublish("physical pot", "range");
-  sb.addSubscribe("virtual pot", "range");
+	// configure the spacebrew publisher and subscriber
+	sb.addPublish("physical pot", "range");
+	sb.addSubscribe("virtual pot", "range");
 
-  // register the string message handler method
-  sb.onRangeMessage(handleRange);
+	// register the string message handler method 
+	sb.onRangeMessage(handleRange);
 
-  // connect to cloud spacebrew server at "sandbox.spacebrew.cc"
-  sb.connect("sandbox.spacebrew.cc");
-}
+	// connect to cloud spacebrew server at "sandbox.spacebrew.cc"
+	sb.connect("sandbox.spacebrew.cc"); 
+} 
 
 
-void loop() {
-  // monitor spacebrew connection for new data
-  sb.monitor();
+void loop() { 
+	// monitor spacebrew connection for new data
+	sb.monitor();
 
-  // connected to spacebrew then send a new value whenever the pot value changes
-  if ( sb.connected() ) {
-    int cur_value = analogRead(A0);
-    if ( last_value != cur_value ) {
-      sb.send("physical pot", cur_value);
-      last_value = cur_value;
-    }
-  }
-}
+	// connected to spacebrew then send a new value whenever the pot value changes
+	if ( sb.connected() ) {
+		int cur_value = analogRead(A0);
+		if ( last_value != cur_value ) {
+			sb.send("physical pot", cur_value);
+			last_value = cur_value;
+		}
+	}
+} 
 
-// handler method that is called whenever a new string message is received
+// handler method that is called whenever a new string message is received 
 void handleRange (String route, int value) {
-  // print the message that was received
-  Serial.print("From ");
-  Serial.print(route);
-  Serial.print(", received msg: ");
-  Serial.println(value);
+	// print the message that was received
+	Serial.print("From ");
+	Serial.print(route);
+	Serial.print(", received msg: ");
+	Serial.println(value);
 }
 
diff --git a/libraries/Bridge/examples/SpacebrewYun/spacebrewString/spacebrewString.ino b/libraries/Bridge/examples/SpacebrewYun/spacebrewString/spacebrewString.ino
index e29db7c86..8c8f1c7c2 100644
--- a/libraries/Bridge/examples/SpacebrewYun/spacebrewString/spacebrewString.ino
+++ b/libraries/Bridge/examples/SpacebrewYun/spacebrewString/spacebrewString.ino
@@ -1,24 +1,24 @@
 /*
   Spacebrew String
-
+ 
  Demonstrates how to create a sketch that sends and receives strings
- to and from Spacebrew. Every time string data is received it
+ to and from Spacebrew. Every time string data is received it 
  is output to the Serial monitor.
 
- Make sure that your Yun is connected to the internet for this example
+ Make sure that your Yun is connected to the internet for this example 
  to function properly.
-
+ 
  The circuit:
  - No circuit required
-
+ 
  created 2013
  by Julio Terra
-
+ 
  This example code is in the public domain.
-
- More information about Spacebrew is available at:
+ 
+ More information about Spacebrew is available at: 
  http://spacebrew.cc/
-
+ 
  */
 
 #include <Bridge.h>
@@ -31,56 +31,54 @@ SpacebrewYun sb = SpacebrewYun("spacebrewYun Strings", "String sender and receiv
 long last_time = 0;
 int interval = 2000;
 
-void setup() {
+void setup() { 
 
-  // start the serial port
-  Serial.begin(57600);
+	// start the serial port
+	Serial.begin(57600);
 
-  // for debugging, wait until a serial console is connected
-  delay(4000);
-  while (!Serial) {
-    ;
-  }
+	// for debugging, wait until a serial console is connected
+	delay(4000);
+	while (!Serial) { ; }
 
-  // start-up the bridge
-  Bridge.begin();
+	// start-up the bridge
+	Bridge.begin();
 
-  // configure the spacebrew object to print status messages to serial
-  sb.verbose(true);
+	// configure the spacebrew object to print status messages to serial
+	sb.verbose(true);
 
-  // configure the spacebrew publisher and subscriber
-  sb.addPublish("speak", "string");
-  sb.addSubscribe("listen", "string");
+	// configure the spacebrew publisher and subscriber
+	sb.addPublish("speak", "string");
+	sb.addSubscribe("listen", "string");
 
-  // register the string message handler method
-  sb.onStringMessage(handleString);
+	// register the string message handler method 
+	sb.onStringMessage(handleString);
 
-  // connect to cloud spacebrew server at "sandbox.spacebrew.cc"
-  sb.connect("sandbox.spacebrew.cc");
-}
+	// connect to cloud spacebrew server at "sandbox.spacebrew.cc"
+	sb.connect("sandbox.spacebrew.cc"); 
+} 
 
 
-void loop() {
-  // monitor spacebrew connection for new data
-  sb.monitor();
+void loop() { 
+	// monitor spacebrew connection for new data
+	sb.monitor();
 
-  // connected to spacebrew then send a string every 2 seconds
-  if ( sb.connected() ) {
+	// connected to spacebrew then send a string every 2 seconds
+	if ( sb.connected() ) {
 
-    // check if it is time to send a new message
-    if ( (millis() - last_time) > interval ) {
-      sb.send("speak", "is anybody out there?");
-      last_time = millis();
-    }
-  }
-}
+		// check if it is time to send a new message
+		if ( (millis() - last_time) > interval ) {
+			sb.send("speak", "is anybody out there?");
+			last_time = millis();
+		}
+	}
+} 
 
-// handler method that is called whenever a new string message is received
+// handler method that is called whenever a new string message is received 
 void handleString (String route, String value) {
-  // print the message that was received
-  Serial.print("From ");
-  Serial.print(route);
-  Serial.print(", received msg: ");
-  Serial.println(value);
+	// print the message that was received
+	Serial.print("From ");
+	Serial.print(route);
+	Serial.print(", received msg: ");
+	Serial.println(value);
 }
 
diff --git a/libraries/SpacebrewYun/keywords.txt b/libraries/SpacebrewYun/keywords.txt
index 20db0451e..7d8667a18 100644
--- a/libraries/SpacebrewYun/keywords.txt
+++ b/libraries/SpacebrewYun/keywords.txt
@@ -1,4 +1,4 @@
-SpacebrewYun	KEYWORD3
+SpacebrewYun	KEYWORD1
 addPublish	KEYWORD2
 addSubscribe	KEYWORD2
 connect	KEYWORD2
@@ -12,4 +12,4 @@ onBooleanMessage	KEYWORD2
 onCustomMessage	KEYWORD2
 onOpen	KEYWORD2
 onClose	KEYWORD2
-onError	KEYWORD2
+onError	KEYWORD2
\ No newline at end of file
diff --git a/libraries/SpacebrewYun/library.properties b/libraries/SpacebrewYun/library.properties
index 13f29ca8f..9f1b8d501 100644
--- a/libraries/SpacebrewYun/library.properties
+++ b/libraries/SpacebrewYun/library.properties
@@ -1,8 +1,10 @@
 name=SpacebrewYun
-version=1.0
 author=Julio Terra
-maintainer=Julio Terra <julioterra@gmail.com>
+email=julioterra@gmail.com
 sentence=Easily connect the Arduino Yun to Spacebrew
 paragraph=This library was developed to enable you to easily connect the Arduino Yun to Spacebrew. To learn more about Spacebrew visit Spacebrew.cc
 url=https://github.com/julioterra/yunSpacebrew
-architectures=*
+architectures=avr
+version=1.0
+dependencies=Bridge
+core-dependencies=arduino (>=1.5.0)
\ No newline at end of file
diff --git a/libraries/SpacebrewYun/src/SpacebrewYun.cpp b/libraries/SpacebrewYun/src/SpacebrewYun.cpp
index 0b71238db..1b692aa96 100644
--- a/libraries/SpacebrewYun/src/SpacebrewYun.cpp
+++ b/libraries/SpacebrewYun/src/SpacebrewYun.cpp
@@ -2,34 +2,38 @@
 
 
 SpacebrewYun::SpacebrewYun(const String& _name, const String& _description) {
-  name = _name;
-  description = _description;
-  subscribers = NULL;
-  publishers = NULL;
+	name = _name;
+	description = _description;
+	subscribers = NULL;
+	publishers = NULL;
 
-  server = "sandbox.spacebrew.cc";
-  port = 9000;
+	server = "sandbox.spacebrew.cc";
+	port = 9000;
 
-  _connected = false;
-  _verbose = false;
-  _error_msg = false;
+	_started = false;
+	_connected = false;
+	_verbose = false;
+	_error_msg = false;
 
-  sub_name = "";
-  sub_msg = "";
-  sub_type = "";
+	sub_name = "";
+	sub_msg = "";
+	sub_type = "";
 
-  read_name = false;
-  read_msg = false;
+	read_name = false;
+	read_msg = false;
 
-  for ( int i = 0; i < pidLength; i++ ) {
-    pid [i] = '\0';
-  }
+	connect_attempt = 0;
+	connect_attempt_inter = 10000;
 
-  for ( int i = 0; i < sbPidsLen; i++ ) {
-    sbPids [i] = '\0';
-  }
+	for ( int i = 0; i < pidLength; i++ ) {
+		pid [i] = '\0';
+	}
 
-  Console.buffer(64);
+	for ( int i = 0; i < sbPidsLen; i++ ) {
+		sbPids [i] = '\0';
+	}
+
+	Console.buffer(64);
 
 }
 
@@ -45,348 +49,356 @@ SpacebrewYun::OnSBOpen SpacebrewYun::_onOpen = NULL;
 SpacebrewYun::OnSBClose SpacebrewYun::_onClose = NULL;
 SpacebrewYun::OnSBError SpacebrewYun::_onError = NULL;
 
-void SpacebrewYun::onOpen(OnSBOpen function) {
-  _onOpen = function;
+void SpacebrewYun::onOpen(OnSBOpen function){
+	_onOpen = function;
 }
-void SpacebrewYun::onClose(OnSBClose function) {
-  _onClose = function;
+void SpacebrewYun::onClose(OnSBClose function){
+	_onClose = function;
 }
-void SpacebrewYun::onRangeMessage(OnRangeMessage function) {
-  _onRangeMessage = function;
+void SpacebrewYun::onRangeMessage(OnRangeMessage function){
+	_onRangeMessage = function;
 }
-void SpacebrewYun::onStringMessage(OnStringMessage function) {
-  _onStringMessage = function;
+void SpacebrewYun::onStringMessage(OnStringMessage function){
+	_onStringMessage = function;
 }
-void SpacebrewYun::onBooleanMessage(OnBooleanMessage function) {
-  _onBooleanMessage = function;
+void SpacebrewYun::onBooleanMessage(OnBooleanMessage function){
+	_onBooleanMessage = function;
 }
-void SpacebrewYun::onCustomMessage(OnCustomMessage function) {
-  _onCustomMessage = function;
+void SpacebrewYun::onCustomMessage(OnCustomMessage function){
+	_onCustomMessage = function;
 }
-void SpacebrewYun::onError(OnSBError function) {
-  _onError = function;
+void SpacebrewYun::onError(OnSBError function){
+	_onError = function;
 }
 
 void SpacebrewYun::addPublish(const String& name, const String& type) {
-  struct Publisher *p = new Publisher();
-  p->name = createString(name.length() + 1);
-  p->type = createString(type.length() + 1);
-  p->confirmed = false;
-  p->time = 0;
-  if (type == "range") {
-    p->lastMsg = createString(sub_msg_int_max);
-    emptyString(p->lastMsg, sub_msg_int_max);
-  }
-  else if (type == "boolean") {
-    p->lastMsg = createString(sub_msg_bool_max);
-    emptyString(p->lastMsg, sub_msg_bool_max);
-  }
-  else {
-    p->lastMsg = createString(sub_msg_str_max);
-    emptyString(p->lastMsg, sub_msg_str_max);
-  }
-  name.toCharArray(p->name, name.length() + 1);
-  type.toCharArray(p->type, type.length() + 1);
+	struct Publisher *p = new Publisher();
+	p->name = createString(name.length() + 1);
+	p->type = createString(type.length() + 1);
+	p->confirmed = false;
+	p->time = 0;
+	if (type == "range") {
+		p->lastMsg = createString(sub_msg_int_max);	
+		emptyString(p->lastMsg, sub_msg_int_max);	
+	}
+	else if (type == "boolean") {
+		p->lastMsg = createString(sub_msg_bool_max);		
+		emptyString(p->lastMsg, sub_msg_bool_max);	
+	}
+	else {
+		p->lastMsg = createString(sub_msg_str_max);		
+		emptyString(p->lastMsg, sub_msg_str_max);	
+	}
+	name.toCharArray(p->name, name.length() + 1);
+	type.toCharArray(p->type, type.length() + 1);
 
-  if (publishers == NULL) {
-    publishers = p;
-  }
-  else {
-    struct Publisher *curr = publishers;
-    int counter = 1;
-    while (curr->next != NULL) {
-      curr = curr->next;
-      counter++;
-    }
-    curr->next = p;
-  }
-  p->next = NULL;
+	if (publishers == NULL){
+		publishers = p;
+	} 
+	else {
+		struct Publisher *curr = publishers;
+		int counter = 1;
+		while(curr->next != NULL){
+			curr = curr->next;
+			counter++;
+		}
+		curr->next = p;
+	}
+	p->next = NULL;
 }
 
 void SpacebrewYun::addSubscribe(const String& name, const String& type) {
-  Subscriber *s = new Subscriber();
-  s->name = createString(name.length() + 1);
-  s->type = createString(type.length() + 1);
-  name.toCharArray(s->name, name.length() + 1);
-  type.toCharArray(s->type, type.length() + 1);
+	Subscriber *s = new Subscriber();
+	s->name = createString(name.length() + 1);
+	s->type = createString(type.length() + 1);
+	name.toCharArray(s->name, name.length() + 1);
+	type.toCharArray(s->type, type.length() + 1);
 
-  if (subscribers == NULL) {
-    subscribers = s;
-  }
-  else {
-    struct Subscriber *curr = subscribers;
-    while (curr->next != NULL) {
-      curr = curr->next;
-    }
-    curr->next = s;
-  }
+	if (subscribers == NULL){
+		subscribers = s;
+	} 
+	else {
+		struct Subscriber *curr = subscribers;
+		while(curr->next != NULL){
+			curr = curr->next;
+		}
+		curr->next = s;
+	}
 }
 
 void SpacebrewYun::connect(String _server, int _port) {
-  server = _server;
-  port = _port;
+	Serial.print(F("NEW LIB"));
+	_started = true;
+	server = _server;
+	port = _port; 
+	connect_attempt = millis();
 
-  killPids();
+	killPids();
 
-  brew.begin("run-spacebrew"); // Process should launch the "curl" command
-  // brew.begin("python"); // Process should launch the "curl" command
-  // brew.addParameter("/usr/lib/python2.7/spacebrew/spacebrew.py"); // Process should launch the "curl" command
-  brew.addParameter("--server");
-  brew.addParameter(server);
-  brew.addParameter("--port");
-  brew.addParameter(String(port));
-  brew.addParameter("-n");
-  brew.addParameter(name);
-  brew.addParameter("-d");
-  brew.addParameter(description);
+	brew.begin("run-spacebrew"); // Process should launch the "curl" command
+	// brew.begin("python"); // Process should launch the "curl" command
+	// brew.addParameter("/usr/lib/python2.7/spacebrew/spacebrew.py"); // Process should launch the "curl" command
+	brew.addParameter("--server");
+	brew.addParameter(server);
+	brew.addParameter("--port");
+	brew.addParameter(String(port));
+	brew.addParameter("-n");
+	brew.addParameter(name);
+	brew.addParameter("-d");
+	brew.addParameter(description);
 
-  if (subscribers != NULL) {
-    struct Subscriber *curr = subscribers;
-    while (curr != NULL) {
-      if (_verbose) {
-        Serial.print(F("Creating subscribers: "));
-        Serial.print(curr->name);
-        Serial.print(F(" of type: "));
-        Serial.println(curr->type);
-      }
+	if (subscribers != NULL) {
+		struct Subscriber *curr = subscribers;
+		while(curr != NULL){
+			if (_verbose) {
+				Serial.print(F("Creating subscribers: "));
+				Serial.print(curr->name);
+				Serial.print(F(" of type: "));
+				Serial.println(curr->type);
+			}
 
-      brew.addParameter("-s"); // Add the URL parameter to "curl"
-      brew.addParameter(curr->name); // Add the URL parameter to "curl"
-      brew.addParameter(","); // Add the URL parameter to "curl"
-      brew.addParameter(curr->type); // Add the URL parameter to "curl"
+			brew.addParameter("-s"); // Add the URL parameter to "curl"
+			brew.addParameter(curr->name); // Add the URL parameter to "curl"
+			brew.addParameter(","); // Add the URL parameter to "curl"
+			brew.addParameter(curr->type); // Add the URL parameter to "curl"
 
-      // if (curr->next == NULL) curr = NULL;
-      // else curr = curr->next;
+			// if (curr->next == NULL) curr = NULL;
+			// else curr = curr->next;
 
-      curr = curr->next;
-    }
-  }
-  if (publishers != NULL) {
-    struct Publisher *curr = publishers;
-    while (curr != NULL) {
-      if (_verbose) {
-        Serial.print(F("Creating publishers: "));
-        Serial.print(curr->name);
-        Serial.print(F(" of type: "));
-        Serial.println(curr->type);
-      }
-      brew.addParameter("-p"); // Add the URL parameter to "curl"
-      brew.addParameter(curr->name); // Add the URL parameter to "curl"
-      brew.addParameter(","); // Add the URL parameter to "curl"
-      brew.addParameter(curr->type); // Add the URL parameter to "curl"
+			curr = curr->next;
+		}
+	}
+	if (publishers != NULL) {
+		struct Publisher *curr = publishers;
+		while(curr != NULL){
+			if (_verbose) {
+				Serial.print(F("Creating publishers: "));
+				Serial.print(curr->name);
+				Serial.print(F(" of type: "));
+				Serial.println(curr->type);
+			}
+			brew.addParameter("-p"); // Add the URL parameter to "curl"
+			brew.addParameter(curr->name); // Add the URL parameter to "curl"
+			brew.addParameter(","); // Add the URL parameter to "curl"
+			brew.addParameter(curr->type); // Add the URL parameter to "curl"
 
-      curr = curr->next;
-    }
-  }
+			curr = curr->next;
+		}
+	}
 
-  Console.begin();
-  if (_verbose) {
-    Serial.println(F("Console started "));
-  }
+	Console.begin();
+	if (_verbose) {
+		Serial.println(F("Console started "));
+	}
 
-  brew.runAsynchronously();
+	brew.runAsynchronously();
 
-  if (_verbose) {
-    Serial.println(F("Brew started "));
-  }
-  while (!Console) {
-    ;
-  }
+	if (_verbose) {
+		Serial.println(F("Brew started "));
+	}
+	while (!Console) { ; }
 }
 
 void SpacebrewYun::monitor() {
-  while (Console.available() > 0) {
-    char c = Console.read();
 
-    if (c == char(CONNECTION_START) && !_connected) {
-      if (_verbose) {
-        Serial.print(F("Connected to spacebrew server at: "));
-        Serial.println(server);
-        Serial.print(F("Application name set to: "));
-        Serial.println(name);
-      }
-      if (_onOpen != NULL) {
-        _onOpen();
-      }
-      _connected = true;
-    }
-    else if (c == char(CONNECTION_END) && _connected) {
-      _connected = false;
-      if (_verbose) {
-        Serial.print(F("Disconnected from spacebrew server at: "));
-        Serial.println(server);
-      }
-      if (_onClose != NULL) {
-        _onClose();
-      }
-    }
+	// if not connected try to reconnect after appropriate interval
+	if (_started && !_connected) {
+		if ((millis() - connect_attempt) > connect_attempt_inter) {
+			connect(server, port);
+		}
+	}
 
-    if (_verbose) {
-      if (c == char(CONNECTION_ERROR)) {
-        _error_msg = true;
-        Serial.println(F("ERROR :: with Spacebrew.py Connection ::"));
-      }
-      else if (_error_msg && c == char(MSG_END)) {
-        _error_msg = false;
-        Serial.println();
-      }
-      if (_error_msg) {
-        Serial.print(c);
-      }
-    }
+	// if message received from console, then process it
+	while (Console.available() > 0) {
+		char c = Console.read();
 
-    if (_connected) {
-      if (c == char(MSG_START)) {
-        read_name = true;
-      } else if (c == char(MSG_DIV) || sub_name.length() > sub_name_max) {
-        read_name = false;
-        read_msg = true;
-      } else if (c == char(MSG_END) || sub_msg.length() > sub_msg_str_max) {
-        if (read_msg == true) {
-          read_msg = false;
-          onMessage();
-          // delay(2);
-        }
-        if (read_confirm == true) {
-          read_confirm = false;
-          onConfirm();
-          delay(2);
-        }
-      } else if (c == char(MSG_CONFIRM)) {
-        read_confirm = true;
-      } else {
-        if (read_name == true) {
-          sub_name += c;
-        } else if (read_confirm == true) {
-          sub_name += c;
-        } else if (read_msg == true) {
-          sub_msg += c;
-        }
-        else if (_verbose) {
-          Serial.print(c);
-        }
-      }
-    }
-  }
+		if (c == char(CONNECTION_START) && _started && !_connected) {
+			if (_verbose) {
+				Serial.print(F("Connected to spacebrew server at: "));
+				Serial.println(server);
+				Serial.print(F("Application name set to: "));
+				Serial.println(name);
+			}
+			if (_onOpen != NULL){
+				_onOpen();
+			}
+			_connected = true;
+		} 	    
 
-  if (publishers != NULL) {
-    struct Publisher *curr = publishers;
-    while ((curr != NULL)) {
+		else if (c == char(CONNECTION_END) && _connected) {
+			_connected = false;
+			if (_verbose) {
+				Serial.print(F("Disconnected from spacebrew server at: "));
+				Serial.println(server);
+			}
+			if (_onClose != NULL){
+				_onClose();
+			}
+		} 	 
 
-      if ( (curr->confirmed == 0) && ((millis() - curr->time) > 50) ) {
-        if (_verbose) {
-          Serial.print(F("resending msg: "));
-          Serial.println(curr->name);
-        }
-        send(curr->name, curr->lastMsg);
-      }
-      curr = curr->next;
-    }
-  }
+		if (_verbose) {
+			if (c == char(CONNECTION_ERROR)) {
+				_error_msg = true;
+					Serial.println(F("ERROR :: with Spacebrew.py Connection ::"));
+			}
+			else if (_error_msg && c == char(MSG_END)) {
+				_error_msg = false;
+				Serial.println();
+			}
+			if (_error_msg) {
+			    Serial.print(c);			
+			}
+		}
+
+		if (_connected) {
+			if (c == char(MSG_START)) {
+				read_name = true;
+			} else if (c == char(MSG_DIV) || sub_name.length() > sub_name_max) {
+				read_name = false;
+				read_msg = true;
+			} else if (c == char(MSG_END) || sub_msg.length() > sub_msg_str_max) {
+				if (read_msg == true) {
+					read_msg = false;
+					onMessage();
+					// delay(2);
+				}
+				if (read_confirm == true) {
+					read_confirm = false;
+					onConfirm();
+					delay(2);
+				}
+			} else if (c == char(MSG_CONFIRM)) {
+				read_confirm = true;
+			} else {
+				if (read_name == true) {
+					sub_name += c;
+				} else if (read_confirm == true) {
+					sub_name += c;
+				} else if (read_msg == true) {
+					sub_msg += c;
+				} 
+				else if (_verbose) {
+					Serial.print(c);
+				}	    	
+			}
+		}
+	}	
+
+	// check if received confirmation that linino received messages 
+	if (publishers != NULL && _connected) {
+		struct Publisher *curr = publishers;
+		while((curr != NULL)){
+
+			if ( (curr->confirmed == 0) && ((millis() - curr->time) > 50) ) {
+				if (_verbose) {
+					Serial.print(F("resending msg: ")); 
+					Serial.println(curr->name);
+				} 
+				send(curr->name, curr->lastMsg);
+			}
+			curr = curr->next;
+		}
+	}
 
 }
 
 void SpacebrewYun::onConfirm() {
-  if (publishers != NULL) {
-    struct Publisher *curr = publishers;
-    while ((curr != NULL)) {
-      if (sub_name.equals(curr->name) == true) {
-        curr->confirmed = true;
-        // if (_verbose) {
-        // 	Serial.print(F("confirmed  "));
-        // 	Serial.println(curr->name);
-        // }
-        break;
-      }
-      curr = curr->next;
-    }
-  }
+	if (publishers != NULL) {
+		struct Publisher *curr = publishers;
+		while((curr != NULL)){
+			if (sub_name.equals(curr->name) == true) {
+				curr->confirmed = true;
+				break;
+			}
+			curr = curr->next;
+		}
+	}
 
-  sub_name = "";
-  sub_msg = "";
-  sub_type = "";
+	sub_name = "";
+	sub_msg = "";
+	sub_type = "";
 }
 
 boolean SpacebrewYun::connected() {
-  return SpacebrewYun::_connected;
+	return SpacebrewYun::_connected;
 }
 
 void SpacebrewYun::verbose(boolean verbose = true) {
-  _verbose = verbose;
+	_verbose = verbose;
 }
 
 void SpacebrewYun::onMessage() {
-  if (subscribers != NULL) {
-    struct Subscriber *curr = subscribers;
-    while ((curr != NULL) && (sub_type == "")) {
-      if (sub_name.equals(curr->name) == true) {
-        sub_type = curr->type;
-      }
-      curr = curr->next;
-    }
-  }
+	if (subscribers != NULL) {
+		struct Subscriber *curr = subscribers;
+		while((curr != NULL) && (sub_type == "")){
+			if (sub_name.equals(curr->name) == true) {
+				sub_type = curr->type;
+			}
+			curr = curr->next;
+		}
+	}
 
-  if ( sub_type.equals("range") ) {
-    if (_onRangeMessage != NULL) {
-      _onRangeMessage( sub_name, int(sub_msg.toInt()) );
-    } else {
-      Serial.println(F("ERROR :: Range message received, no callback method is registered"));
-    }
-  } else if ( sub_type.equals("boolean") ) {
-    if (_onBooleanMessage != NULL) {
-      _onBooleanMessage( sub_name, ( sub_msg.equals("false") ? false : true ) );
-    } else {
-      Serial.println(F("ERROR :: Boolean message received, no callback method is registered"));
-    }
-  } else if ( sub_type.equals("string") ) {
-    if (_onStringMessage != NULL) {
-      _onStringMessage( sub_name, sub_msg );
-    } else {
-      Serial.println(F("ERROR :: String message received, no callback method is registered"));
-    }
-  } else {
-    if (_onCustomMessage != NULL) {
-      _onCustomMessage( sub_name, sub_msg, sub_type );
-    } else {
-      Serial.println(F("ERROR :: Custom message received, no callback method is registered"));
-    }
-  }
+	if ( sub_type.equals("range") ) {
+		if (_onRangeMessage != NULL) {
+			_onRangeMessage( sub_name, int(sub_msg.toInt()) );
+		} else {
+			Serial.println(F("ERROR :: Range message received, no callback method is registered"));
+		}
+	} else if ( sub_type.equals("boolean") ) {
+		if (_onBooleanMessage != NULL) {
+			_onBooleanMessage( sub_name, ( sub_msg.equals("false") ? false : true ) );
+		} else {
+			Serial.println(F("ERROR :: Boolean message received, no callback method is registered"));
+		}
+	} else if ( sub_type.equals("string") ) {
+		if (_onStringMessage != NULL) {
+			_onStringMessage( sub_name, sub_msg );	
+		} else {
+			Serial.println(F("ERROR :: String message received, no callback method is registered"));
+		}
+	} else {
+		if (_onCustomMessage != NULL) {
+			_onCustomMessage( sub_name, sub_msg, sub_type );
+		} else {
+			Serial.println(F("ERROR :: Custom message received, no callback method is registered"));
+		}
+	}
 
-  sub_name = "";
-  sub_msg = "";
-  sub_type = "";
+	sub_name = "";
+	sub_msg = "";
+	sub_type = "";
 }
 
 
-void SpacebrewYun::send(const String& name, const String& value) {
-  if (publishers != NULL) {
+void SpacebrewYun::send(const String& name, const String& value){
+	if (publishers != NULL) {
 
-    Console.print(char(29));
-    Console.print(name);
-    Console.print(char(30));
-    Console.print(value);
-    Console.print(char(31));
-    Console.flush();
+		Console.print(char(29));
+		Console.print(name);
+		Console.print(char(30));
+		Console.print(value);
+		Console.print(char(31));
+		Console.flush();			
 
-    struct Publisher *curr = publishers;
-    while (curr != NULL) {
-      if (name.equals(curr->name) == true) {
-        int msg_len = 0;
+		struct Publisher *curr = publishers;
+		while(curr != NULL){
+			if (name.equals(curr->name) == true) {
+				int msg_len = 0;
 
-        if (curr->type == "range") msg_len = sub_msg_int_max;
-        else if (curr->type == "boolean") msg_len = sub_msg_bool_max;
-        else msg_len = sub_msg_str_max;
+				if (curr->type == "range") msg_len = sub_msg_int_max;	
+				else if (curr->type == "boolean") msg_len = sub_msg_bool_max;		
+				else msg_len = sub_msg_str_max;		
 
-        if (value.length() < msg_len) msg_len = value.length() + 1;
-        value.toCharArray(curr->lastMsg, msg_len);
+				if (value.length() < msg_len) msg_len = value.length() + 1;
+				value.toCharArray(curr->lastMsg, msg_len);
 
-        curr->confirmed = false;
-        curr->time = millis();
+				curr->confirmed = false;
+				curr->time = millis();
 
-      }
-      curr = curr->next;
-    }
-  }
+			}
+			curr = curr->next;
+		}	
+	}	
 }
 
 
@@ -395,67 +407,67 @@ void SpacebrewYun::send(const String& name, const String& value) {
  */
 void SpacebrewYun::getPids() {
 
-  // request the pid of all python processes
-  // brew.begin("run-getsbpids"); // Process should launch the "curl" command
-  pids.begin("python");
-  pids.addParameter("/usr/lib/python2.7/spacebrew/getprocpid.py"); // Process should launch the "curl" command
-  pids.run();
+	// request the pid of all python processes
+	// brew.begin("run-getsbpids"); // Process should launch the "curl" command
+	pids.begin("python");
+	pids.addParameter("/usr/lib/python2.7/spacebrew/getprocpid.py"); // Process should launch the "curl" command
+	pids.run();
 
-  if (_verbose) {
-    Serial.println(F("Checking if spacebrew process already running"));
-  }
+	if (_verbose) {
+		Serial.println(F("Checking if spacebrew process already running"));
+	}
 
-  int sbPidsIndex = 0;
-  int pidCharIndex = 0;
-  char c = '\0';
+	int sbPidsIndex = 0;
+	int pidCharIndex = 0;
+	char c = '\0';
 
-  while ( pids.available() > 0 ) {
+	while ( pids.available() > 0 ) {
 
-    c = pids.read();
+	    c = pids.read();
 
-    if ( c >= '0' && c <= '9' ) {
-      pid[pidCharIndex] = c;
-      pidCharIndex = (pidCharIndex + 1) % pidLength;
-    }
+		if ( c >= '0' && c <= '9' ) {
+			pid[pidCharIndex] = c;
+			pidCharIndex = (pidCharIndex + 1) % pidLength;
+		} 
 
-    else if ( (c == ' ' || c == '\n') && pidCharIndex > 0) {
-      sbPids[sbPidsIndex] = atoi(pid);
-      if ( sbPidsIndex < (sbPidsLen - 1) ) sbPidsIndex = (sbPidsIndex + 1);
+		else if ( (c == ' ' || c == '\n') && pidCharIndex > 0) {
+			sbPids[sbPidsIndex] = atoi(pid);
+			if ( sbPidsIndex < (sbPidsLen - 1) ) sbPidsIndex = (sbPidsIndex + 1);    		
 
-      for ( int i = 0; i < pidLength; i++ ) {
-        pid[i] = '\0';
-        pidCharIndex = 0;
-      }
-    }
-  }
+			for( int i = 0; i < pidLength; i++ ){ 
+				pid[i] = '\0';
+				pidCharIndex = 0;
+			}
+		}
+	}
 }
 
 /**
- * method that kills all of the spacebrew.py instances that are running
+ * method that kills all of the spacebrew.py instances that are running 
  * on the linino.
  */
 void SpacebrewYun::killPids() {
-  getPids();
-  delay(400);
+	getPids();
+	delay(400);
 
-  for (int i = 0; i < sbPidsLen; i ++) {
-    if (sbPids[i] > 0) {
-      char * newPID = itoa(sbPids[i], pid, 10);
+	for (int i = 0; i < sbPidsLen; i ++) {
+		if (sbPids[i] > 0) {
+			char * newPID = itoa(sbPids[i], pid, 10);
 
-      if (_verbose) {
-        Serial.print(F("Stopping existing spacebrew processes with pids: "));
-        Serial.println(newPID);
-      }
+			if (_verbose) {
+				Serial.print(F("Stopping existing spacebrew processes with pids: "));
+				Serial.println(newPID);
+			}
 
-      Process p;
-      p.begin("kill");
-      p.addParameter("-9");
-      p.addParameter(newPID);		// Process should launch the "curl" command
-      p.run();            		// Run the process and wait for its termination
+			Process p;
+			p.begin("kill");
+			p.addParameter("-9");
+			p.addParameter(newPID);		// Process should launch the "curl" command
+			p.run();            		// Run the process and wait for its termination	
 
-      delay(400);
-    }
-  }
+			delay(400);						
+		}
+	}
 }
 
 
diff --git a/libraries/SpacebrewYun/src/SpacebrewYun.h b/libraries/SpacebrewYun/src/SpacebrewYun.h
index ce9ddca28..7c09c26b6 100644
--- a/libraries/SpacebrewYun/src/SpacebrewYun.h
+++ b/libraries/SpacebrewYun/src/SpacebrewYun.h
@@ -7,29 +7,29 @@
 #include <Console.h>
 #include <Process.h>
 
-enum SBmsg {
-  CONNECTION_START = char(28),
-  CONNECTION_END = char(27),
-  CONNECTION_ERROR = char(26),
-  MSG_CONFIRM = char(7),
-  MSG_START = char(29),
-  MSG_DIV = char(30),
-  MSG_END = char(31)
+enum SBmsg { 
+	CONNECTION_START = char(28), 
+	CONNECTION_END = char(27), 
+	CONNECTION_ERROR = char(26), 
+	MSG_CONFIRM = char(7), 
+	MSG_START = char(29), 
+	MSG_DIV = char(30), 
+	MSG_END = char(31) 
 };
 
 struct Publisher {
-  char *name;
-  char *type;
-  char *lastMsg;
-  Publisher *next;
-  int confirmed;
-  long time;
+	char *name;
+	char *type;
+	char *lastMsg;
+	Publisher *next;
+	int confirmed;
+	long time;
 };
 
-struct Subscriber {
-  char *name;
-  char *type;
-  Subscriber *next;
+struct Subscriber{
+	char *name;
+	char *type;
+	Subscriber *next;
 };
 
 int const pidLength = 6;
@@ -37,114 +37,102 @@ int const sbPidsLen = 4;
 
 class SpacebrewYun {
 
-  public:
+	public:
 
-    SpacebrewYun(const String&, const String&);
-    void addPublish(const String&, const String&);
-    void addSubscribe(const String&, const String&);
+		SpacebrewYun(const String&, const String&);
+		void addPublish(const String&, const String&);
+		void addSubscribe(const String&, const String&);
 
-    void connect(String, int);
-    void connect() {
-      connect(server, port);
-    };
-    void connect(String _server) {
-      connect(String(_server), port);
-    };
+		void connect(String, int);
+		void connect() { connect(server, port); };
+		void connect(String _server) { connect(String(_server), port); };
 
-    void monitor();
-    void onMessage();
-    void onConfirm();
+		void monitor();
+		void onMessage();
+		void onConfirm();
 
-    boolean connected();
+		boolean connected();
 
-    void send(const String&, const String&);
-    void send(const String& name, char * value) {
-      send(name, String(value));
-    }
-    void send(const String& name, bool value) {
-      send(name, (value ? String("true") : String("false")));
-    };
-    void send(const String& name, int value) {
-      send(name, String(value));
-    };
-    void send(const String& name, long value) {
-      send(name, String(value));
-    };
-    void send(const String& name, float value) {
-      send(name, String(value));
-    };
+		void send(const String&, const String&);
+		void send(const String& name, char * value) { send(name, String(value)); }
+		void send(const String& name, bool value){ send(name, (value ? String("true") : String("false"))); };
+		void send(const String& name, int value) { send(name, String(value)); };
+		void send(const String& name, long value) { send(name, String(value)); };
+		void send(const String& name, float value) { send(name, String(value)); };
 
-    void verbose(boolean);
+		void verbose(boolean);
 
-    typedef void (*OnBooleanMessage)(String name, boolean value);
-    typedef void (*OnRangeMessage)(String name, int value);
-    typedef void (*OnStringMessage)(String name, String value);
-    typedef void (*OnCustomMessage)(String name, String value, String type);
-    typedef void (*OnSBOpen)();
-    typedef void (*OnSBClose)();
-    typedef void (*OnSBError)(int code, String message);
+		typedef void (*OnBooleanMessage)(String name, boolean value);
+		typedef void (*OnRangeMessage)(String name, int value);
+		typedef void (*OnStringMessage)(String name, String value);
+		typedef void (*OnCustomMessage)(String name, String value, String type);
+		typedef void (*OnSBOpen)();
+		typedef void (*OnSBClose)();
+		typedef void (*OnSBError)(int code, String message);
 
-    void onOpen(OnSBOpen function);
-    void onClose(OnSBClose function);
-    void onRangeMessage(OnRangeMessage function);
-    void onStringMessage(OnStringMessage function);
-    void onBooleanMessage(OnBooleanMessage function);
-    void onCustomMessage(OnCustomMessage function);
-    void onError(OnSBError function);
+		void onOpen(OnSBOpen function);
+		void onClose(OnSBClose function);
+		void onRangeMessage(OnRangeMessage function);
+		void onStringMessage(OnStringMessage function);
+		void onBooleanMessage(OnBooleanMessage function);
+		void onCustomMessage(OnCustomMessage function);
+		void onError(OnSBError function);
 
-  private:
+	private:
 
-    Process brew;
-    String name;
-    String server;
-    String description;
-    boolean _connected;
-    boolean _error_msg;
-    boolean _verbose;
-    int port;
+		Process brew;
+		String name;
+		String server;
+		String description;
+		boolean _started;
+		boolean _connected;
+		boolean _error_msg;
+		boolean _verbose;
+		int port;
 
-    /**Output should be at least 5 cells**/
-    static OnBooleanMessage _onBooleanMessage;
-    static OnRangeMessage _onRangeMessage;
-    static OnStringMessage _onStringMessage;
-    static OnCustomMessage _onCustomMessage;
-    static OnSBOpen _onOpen;
-    static OnSBClose _onClose;
-    static OnSBError _onError;
+		/**Output should be at least 5 cells**/
+		static OnBooleanMessage _onBooleanMessage;
+		static OnRangeMessage _onRangeMessage;
+		static OnStringMessage _onStringMessage;
+		static OnCustomMessage _onCustomMessage;
+		static OnSBOpen _onOpen;
+		static OnSBClose _onClose;
+		static OnSBError _onError;
 
-    Subscriber * subscribers;
-    Publisher * publishers;
-    String sub_name;
-    String sub_msg;
-    String sub_type;
+		Subscriber * subscribers;
+		Publisher * publishers;
+		String sub_name;
+		String sub_msg;
+		String sub_type;
 
-    boolean read_name;
-    boolean read_msg;
-    boolean read_confirm;
-    static int sub_name_max;
-    static int sub_msg_str_max;
-    static int sub_msg_int_max;
-    static int sub_msg_bool_max;
-    // int sub_name_max;
-    // int sub_msg_str_max;
+		boolean read_name;
+		boolean read_msg;
+		boolean read_confirm;
+		static int sub_name_max;
+		static int sub_msg_str_max;
+		static int sub_msg_int_max;
+		static int sub_msg_bool_max;
 
-    Process pids;
-    char pid [6];
-    int sbPids [4];
+		long connect_attempt;
+		int connect_attempt_inter;
 
-    void killPids();
-    void getPids();
+		Process pids;
+		char pid [6];
+		int sbPids [4];
 
-    static char * createString(int len) {
-      char * out = ( char * ) malloc ( len + 1 );
-      return out;
-    }
+		void killPids();
+		void getPids();
 
-    static void emptyString(char * str, int len) {
-      for (int i = 0; i < len; i++) {
-        str[i] = '\0';
-      }
-    }
+		static char * createString(int len){
+			char * out = ( char * ) malloc ( len + 1 );
+			return out;
+		}		
+
+		static void emptyString(char * str, int len){
+			for (int i = 0; i < len; i++) {
+				str[i] = '\0';
+			}
+		}
 
 };