Merge branch 'master' of https://github.com/eternnoir/pyTelegramBotAPI into refactoring

Author: pevdh

setup.py

@@ -7,7 +7,7 @@ def readme():
         return f.read()
 
 setup(name='pyTelegramBotAPI',
-      version='2.1.1',
+      version='2.1.2',
       description='Python Telegram bot api. ',
       long_description=readme(),
       author='eternnoir',

telebot/types.py

@@ -3,6 +3,8 @@
 import json
 import six
 
+from telebot import util
+
 
 class JsonSerializable:
     """
@@ -553,7 +555,7 @@ def add(self, *args):
         i = 1
         row = []
         for button in args:
-            if isinstance(button, str):
+            if util.is_string(button):
                 row.append({'text': button})
             else:
                 row.append(button.to_dic())
@@ -574,7 +576,7 @@ def row(self, *args):
         """
         btn_array = []
         for button in args:
-            if isinstance(button, str):
+            if util.is_string(button):
                 btn_array.append({'text': button})
             else:
                 btn_array.append(button.to_dic())
@@ -1194,8 +1196,8 @@ def __init__(self, id, title, latitude, longitude, address, foursquare_id=None,
         self.thumb_height = thumb_height
 
     def to_json(self):
-        json_dict = {'type': self.type, 'id': self.id, 'latitude': self.latitude, 'longitude': self.longitude,
-                     'address': self.address}
+        json_dict = {'type': self.type, 'id': self.id, 'title': self.title, 'latitude': self.latitude,
+                     'longitude': self.longitude, 'address': self.address}
         if self.foursquare_id:
             json_dict['foursquare_id'] = self.foursquare_id
         if self.thumb_url: