From abe76e6068e385381b7288b5df0958f438b489d1 Mon Sep 17 00:00:00 2001
From: Rubenlagus <rberlopez>
Date: Wed, 14 Oct 2015 19:51:24 +0200
Subject: [PATCH 01/10] 1. Support for channels

---
 .idea/workspace.xml                           | 964 ++++++++----------
 src/main/java/org/telegram/SenderHelper.java  |  18 +-
 .../telegram/api/methods/ForwardMessage.java  |  10 +-
 .../org/telegram/api/methods/SendAudio.java   |   6 +-
 .../telegram/api/methods/SendChatAction.java  |  10 +-
 .../telegram/api/methods/SendDocument.java    |  11 +-
 .../telegram/api/methods/SendLocation.java    |  11 +-
 .../org/telegram/api/methods/SendMessage.java |  11 +-
 .../org/telegram/api/methods/SendPhoto.java   |   6 +-
 .../org/telegram/api/methods/SendSticker.java |   6 +-
 .../org/telegram/api/methods/SendVideo.java   |   6 +-
 .../org/telegram/api/methods/SendVoice.java   |   2 +-
 .../java/org/telegram/api/objects/Chat.java   |  88 +-
 .../org/telegram/api/objects/Message.java     |  26 +-
 .../updateshandlers/DirectionsHandlers.java   |  16 +-
 .../updateshandlers/FilesHandlers.java        |  22 +-
 .../updateshandlers/TransifexHandlers.java    |   6 +-
 .../updateshandlers/WeatherHandlers.java      |  80 +-
 18 files changed, 631 insertions(+), 668 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 62f9d18..4e50f1c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,101 +2,28 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="cc3252dd-ba1f-404e-b603-ef880b5c3341" name="Default" comment="1. Webhooks&#10;">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jsoup_jsoup_1_8_3.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/interfaces/BotApiObject.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/interfaces/IToJson.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/BotApiMethod.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/ForwardMessage.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetFile.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetMe.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetUserProfilePhotos.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendMessage.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SetWebhook.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Contact.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/File.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/PhotoSize.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Sticker.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/User.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/UserProfilePhotos.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/SentCallback.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/resources/localisation/strings_de.properties" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jsoup_jsoup_1_8_2.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/Contact.java" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/PhotoSize.java" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/Sticker.java" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/User.java" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/UserProfilePhotos.java" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/methods/ForwardMessage.java" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/methods/GetMe.java" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/methods/GetUserProfilePhotos.java" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendMessage.java" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/methods/SetWebhook.java" afterPath="" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_5_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_5_4.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_5_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_5_4.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_5_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_5_4.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_5_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_5_4.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_5_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_5_4.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_5_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_5_4.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_35.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_36.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_1.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_3.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_1.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_grizzly_grizzly_framework_2_3_19.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_grizzly_grizzly_framework_2_3_22.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_grizzly_grizzly_http_2_3_19.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_grizzly_grizzly_http_2_3_22.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_grizzly_grizzly_http_server_2_3_19.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_grizzly_grizzly_http_server_2_3_22.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_4_0_b12.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_4_0_b31.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_4_0_b12.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_4_0_b31.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_4_0_b12.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_4_0_b31.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_4_0_b12.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_4_0_b31.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_4_0_b12.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_4_0_b31.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_18.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_21.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_grizzly2_http_2_18.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_grizzly2_http_2_21.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_18.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_21.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_18.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_21.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_18.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_21.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_18.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_21.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_18.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_21.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_json_jackson_2_18.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_json_jackson_2_21.xml" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/Audio.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Audio.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/Chat.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Chat.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/Document.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Document.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/ForceReplyKeyboard.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ForceReplyKeyboard.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/Location.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Location.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/Message.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/ReplyKeyboard.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ReplyKeyboard.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/ReplyKeyboardHide.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ReplyKeyboardHide.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/ReplyKeyboardMarkup.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ReplyKeyboardMarkup.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/Update.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Update.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/Video.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Video.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/Voice.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Voice.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/methods/Constants.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/Constants.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/methods/GetUpdates.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetUpdates.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendAudio.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendAudio.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendChatAction.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendChatAction.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendDocument.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendDocument.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendLocation.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendLocation.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendPhoto.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendPhoto.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendSticker.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendSticker.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendVideo.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVideo.java" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendVoice.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVoice.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/BotAPi.iml" afterPath="$PROJECT_DIR$/BotAPi.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/services/TransifexService.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/services/TransifexService.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Chat.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Chat.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/ForwardMessage.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/ForwardMessage.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendAudio.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendAudio.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendChatAction.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendChatAction.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendDocument.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendDocument.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendLocation.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendLocation.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendMessage.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendMessage.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendPhoto.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendPhoto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendSticker.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendSticker.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVideo.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVideo.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVoice.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVoice.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/UpdatesCallback.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/UpdatesCallback.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/RestApi.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/RestApi.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/localisation/strings.properties" afterPath="$PROJECT_DIR$/src/main/resources/localisation/strings.properties" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dataSources.xml" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="BotAPi.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -140,43 +67,127 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="BuildVars.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java">
+      <file leaf-file-name="WeatherHandlers.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.21333334">
+              <caret line="123" column="72" selection-start-line="123" selection-start-column="72" selection-end-line="123" selection-end-column="72" />
+              <folding>
+                <element signature="method#getSettingsMessage#0;class#WeatherHandlers#0" expanded="false" />
+                <element signature="method#getHelpMessage#0;class#WeatherHandlers#0" expanded="false" />
+                <element signature="method#getLanguageMessage#0;class#WeatherHandlers#0" expanded="false" />
+                <element signature="method#getUnitsMessage#0;class#WeatherHandlers#0" expanded="false" />
+                <element signature="method#getChooseNewAlertSetMessage#0;class#WeatherHandlers#0" expanded="false" />
+                <element signature="method#getMainMenuKeyboard#0;class#WeatherHandlers#0" expanded="false" />
+                <element signature="method#getLanguagesKeyboard#0;class#WeatherHandlers#0" expanded="false" />
+                <element signature="method#getUnitsKeyboard#0;class#WeatherHandlers#0" expanded="false" />
+                <element signature="method#getSettingsKeyboard#0;class#WeatherHandlers#0" expanded="false" />
+                <element signature="method#getRecentsKeyboard#0;class#WeatherHandlers#0" expanded="false" />
+                <element signature="method#getRecentsKeyboard#1;class#WeatherHandlers#0" expanded="false" />
+                <element signature="method#getAlertsKeyboard#0;class#WeatherHandlers#0" expanded="false" />
+                <element signature="method#getAlertsListKeyboard#0;class#WeatherHandlers#0" expanded="false" />
+                <element signature="method#getForceReply#0;class#WeatherHandlers#0" expanded="false" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="DirectionsHandlers.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="15" column="74" selection-start-line="15" selection-start-column="74" selection-end-line="15" selection-end-column="74" />
+              <caret line="211" column="67" selection-start-line="211" selection-start-column="67" selection-end-line="211" selection-end-column="67" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="BotConfig.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java">
+      <file leaf-file-name="FilesHandlers.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="15" column="61" selection-start-line="15" selection-start-column="61" selection-end-line="15" selection-end-column="61" />
+              <caret line="237" column="67" selection-start-line="237" selection-start-column="67" selection-end-line="237" selection-end-column="67" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="SenderHelper.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="TransifexHandlers.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0">
+              <caret line="93" column="75" selection-start-line="93" selection-start-column="75" selection-end-line="93" selection-end-column="75" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="SendMessage.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendMessage.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0">
+              <caret line="147" column="45" selection-start-line="147" selection-start-column="45" selection-end-line="147" selection-end-column="45" />
+              <folding>
+                <element signature="e#1831#1832#0" expanded="true" />
+                <element signature="e#1867#1868#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="SenderHelper.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.5371517">
-              <caret line="272" column="53" selection-start-line="272" selection-start-column="53" selection-end-line="272" selection-end-column="53" />
+            <state vertical-scroll-proportion="0.0">
+              <caret line="259" column="0" selection-start-line="259" selection-start-column="0" selection-end-line="259" selection-end-column="0" />
               <folding>
                 <element signature="docComment;class#SenderHelper#0" expanded="false" />
-                <element signature="method#SendDocument#0;class#SenderHelper#0" expanded="false" />
-                <element signature="method#SendPhoto#0;class#SenderHelper#0" expanded="false" />
-                <element signature="method#SendVideo#0;class#SenderHelper#0" expanded="false" />
-                <element signature="method#sendSticker#0;class#SenderHelper#0" expanded="false" />
-                <element signature="method#SendWebhook#0;class#SenderHelper#0" expanded="false" />
+                <element signature="method#SendApiMethodAsync#0;class#SenderHelper#0" expanded="false" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="BuildVars.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0">
+              <caret line="10" column="50" selection-start-line="10" selection-start-column="50" selection-end-line="10" selection-end-column="50" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/Main.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0">
+              <caret line="32" column="44" selection-start-line="32" selection-start-column="44" selection-end-line="32" selection-end-column="44" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="BotConfig.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0">
+              <caret line="15" column="96" selection-start-line="15" selection-start-column="96" selection-end-line="15" selection-end-column="96" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Webhook.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0">
+              <caret line="35" column="25" selection-start-line="35" selection-start-column="25" selection-end-line="35" selection-end-column="25" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -201,7 +212,7 @@
       </map>
     </option>
     <push-targets>
-      <push-target-info repo="$PROJECT_DIR$" source="master" target-remote="origin" target-branch="dev" />
+      <push-target-info repo="$PROJECT_DIR$" source="master" target-remote="origin" target-branch="master" />
     </push-targets>
   </component>
   <component name="GradleLocalSettings">
@@ -212,15 +223,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/methods/GetUserProfilePhotos.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/methods/BotApiMethod.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/methods/IToJson.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/methods/GetMe.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/Audio.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/Chat.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/Contact.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/Document.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/ForceReplyKeyboard.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/PhotoSize.java" />
@@ -239,11 +241,7 @@
         <option value="$PROJECT_DIR$/src/main/resources/localisation/strings.properties" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ApiBool.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/UserProfilePhotos.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendChatAction.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetMe.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/ForwardMessage.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendMessage.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetUserProfilePhotos.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/UpdatesCallback.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/interfaces/BotApiObject.java" />
@@ -251,18 +249,31 @@
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/BotApiMethod.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/SentCallback.java" />
         <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendLocation.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/RestApi.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/File.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetFile.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Chat.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java" />
+        <option value="/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/Integer.java" />
+        <option value="/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/Number.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendDocument.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/ForwardMessage.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendAudio.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendChatAction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendLocation.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendPhoto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendSticker.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVideo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVoice.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendMessage.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" />
       </list>
     </option>
   </component>
@@ -310,6 +321,9 @@
       </PATH>
     </treeState>
   </component>
+  <component name="NamedScopeManager">
+    <order />
+  </component>
   <component name="ProjectFrameBounds">
     <option name="width" value="1366" />
     <option name="height" value="768" />
@@ -447,8 +461,6 @@
       <autoscrollToSource />
       <autoscrollFromSource />
       <sortByType />
-      <manualOrder />
-      <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
       <pane id="Scope" />
@@ -571,6 +583,36 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="BotAPi" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="BotAPi" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="telegram" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="updateshandlers" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="BotAPi" />
@@ -780,15 +822,6 @@
       <option name="CLEAR_LOGCAT" value="false" />
       <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
       <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
-      <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" />
-      <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
-      <option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" />
-      <option name="SELECTED_CLOUD_DEVICE_PROJECT_ID" value="" />
-      <option name="IS_VALID_CLOUD_MATRIX_SELECTION" value="false" />
-      <option name="INVALID_CLOUD_MATRIX_SELECTION_ERROR" value="" />
-      <option name="IS_VALID_CLOUD_DEVICE_SELECTION" value="false" />
-      <option name="INVALID_CLOUD_DEVICE_SELECTION_ERROR" value="" />
-      <option name="CLOUD_DEVICE_SERIAL_NUMBER" value="" />
       <method />
     </configuration>
     <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
@@ -810,15 +843,6 @@
       <option name="CLEAR_LOGCAT" value="false" />
       <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
       <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
-      <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" />
-      <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
-      <option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" />
-      <option name="SELECTED_CLOUD_DEVICE_PROJECT_ID" value="" />
-      <option name="IS_VALID_CLOUD_MATRIX_SELECTION" value="false" />
-      <option name="INVALID_CLOUD_MATRIX_SELECTION_ERROR" value="" />
-      <option name="IS_VALID_CLOUD_DEVICE_SELECTION" value="false" />
-      <option name="INVALID_CLOUD_DEVICE_SELECTION_ERROR" value="" />
-      <option name="CLOUD_DEVICE_SERIAL_NUMBER" value="" />
       <method />
     </configuration>
     <configuration default="true" type="Applet" factoryName="Applet">
@@ -843,65 +867,6 @@
       <envs />
       <method />
     </configuration>
-    <configuration default="true" type="ArquillianJUnit" factoryName="">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="ArquillianTestNG" factoryName="">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
     <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <option name="myFilePath" />
@@ -1017,27 +982,6 @@
       <patterns />
       <method />
     </configuration>
-    <configuration default="true" type="JUnitTestDiscovery" factoryName="JUnit Test Discovery" changeList="All">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
     <configuration default="true" type="JarApplication" factoryName="JAR Application">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <envs />
@@ -1046,19 +990,6 @@
     <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
       <method />
     </configuration>
-    <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="BotAPi" />
-      <envs />
-      <method />
-    </configuration>
     <configuration default="true" type="MavenRunConfiguration" factoryName="Maven">
       <MavenSettings>
         <option name="myGeneralSettings" />
@@ -1126,34 +1057,6 @@
       <listeners />
       <method />
     </configuration>
-    <configuration default="true" type="TestNGTestDiscovery" factoryName="TestNG Test Discovery" changeList="All">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-      <method />
-    </configuration>
     <configuration default="true" type="executeSpecs" factoryName="Gauge Execution">
       <setting name="environment" value="" />
       <setting name="specsToExecute" value="" />
@@ -1176,12 +1079,6 @@
       <envs />
       <method />
     </configuration>
-    <configuration default="true" type="js.build_tools.npm" factoryName="npm">
-      <command value="run-script" />
-      <scripts />
-      <envs />
-      <method />
-    </configuration>
     <configuration default="true" type="mocha-javascript-test-runner" factoryName="Mocha">
       <node-options />
       <working-directory>$PROJECT_DIR$</working-directory>
@@ -1189,7 +1086,6 @@
       <envs />
       <ui>bdd</ui>
       <extra-mocha-options />
-      <test-kind>DIRECTORY</test-kind>
       <test-directory />
       <recursive>false</recursive>
       <method />
@@ -1317,6 +1213,10 @@
       <workItem from="1442509638881" duration="1065000" />
       <workItem from="1444159378099" duration="3286000" />
       <workItem from="1444254325959" duration="288000" />
+      <workItem from="1444255115907" duration="212000" />
+      <workItem from="1444323303608" duration="5644000" />
+      <workItem from="1444501308862" duration="423000" />
+      <workItem from="1444843707388" duration="1293000" />
     </task>
     <task id="LOCAL-00001" summary="First Commit:&#10;1. Transifex bot&#10;2. Weather bot">
       <created>1434854005227</created>
@@ -1604,7 +1504,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="248233000" />
+    <option name="totallyTimeSpent" value="255805000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1619,66 +1519,66 @@
     <frame x="0" y="0" width="1366" height="768" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295129" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27793697" sideWeight="0.5120846" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16691843" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32344213" sideWeight="0.49697885" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26283988" sideWeight="0.8281623" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19335347" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19561933" sideWeight="0.1718377" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Dynamic Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4002976" sideWeight="0.4879154" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32886904" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32886904" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Database Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32886904" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32589287" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295129" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32886904" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.27793697" sideWeight="0.5120846" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16691843" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32440478" sideWeight="0.49697885" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32886904" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26283988" sideWeight="0.8281623" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19335347" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19561933" sideWeight="0.1718377" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.4002976" sideWeight="0.4879154" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Dynamic Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Database Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32886904" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32589287" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27793697" sideWeight="0.5120846" order="9" side_tool="true" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32930514" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19335347" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Dynamic Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.39285713" sideWeight="0.4879154" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295129" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32886904" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32857144" sideWeight="0.49697885" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295129" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
-      <window_info id="Database Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32886904" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19561933" sideWeight="0.8281623" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3264095" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19561933" sideWeight="0.1718377" order="4" side_tool="true" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.27793697" sideWeight="0.5120846" order="9" side_tool="true" content_ui="tabs" />
+      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19335347" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Dynamic Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.39285713" sideWeight="0.4879154" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295129" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32886904" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32857144" sideWeight="0.49697885" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295129" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
+      <window_info id="Database Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32886904" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19561933" sideWeight="0.8281623" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3264095" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19561933" sideWeight="0.1718377" order="4" side_tool="true" content_ui="tabs" />
     </layout-to-restore>
   </component>
   <component name="Vcs.Log.UiProperties">
@@ -1741,47 +1641,29 @@
           <properties />
           <option name="timeStamp" value="84" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java</url>
-          <line>71</line>
-          <properties />
-          <option name="timeStamp" value="138" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java</url>
-          <line>65</line>
-          <properties />
-          <option name="timeStamp" value="141" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java</url>
-          <line>62</line>
-          <properties />
-          <option name="timeStamp" value="142" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java</url>
           <line>119</line>
           <properties />
           <option name="timeStamp" value="178" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java</url>
-          <line>95</line>
-          <properties />
-          <option name="timeStamp" value="215" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java</url>
           <line>58</line>
           <properties />
           <option name="timeStamp" value="245" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java</url>
+          <line>275</line>
+          <properties />
+          <option name="timeStamp" value="259" />
+        </line-breakpoint>
       </breakpoints>
       <breakpoints-dialog>
         <breakpoints-dialog />
       </breakpoints-dialog>
-      <option name="time" value="256" />
+      <option name="time" value="264" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -1790,59 +1672,22 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Document.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.742236">
-          <caret line="51" column="45" selection-start-line="51" selection-start-column="45" selection-end-line="51" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ForceReplyKeyboard.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.51086956">
-          <caret line="50" column="9" selection-start-line="50" selection-start-column="9" selection-end-line="50" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Location.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.371118">
-          <caret line="32" column="39" selection-start-line="32" selection-start-column="39" selection-end-line="32" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/PhotoSize.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.58229816">
-          <caret line="42" column="60" selection-start-line="42" selection-start-column="60" selection-end-line="42" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ReplyKeyboardMarkup.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.69720495">
-          <caret line="62" column="46" selection-start-line="62" selection-start-column="46" selection-end-line="62" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Update.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6754658">
-          <caret line="38" column="58" selection-start-line="38" selection-start-column="58" selection-end-line="38" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Sticker.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.53571427">
-          <caret line="44" column="42" selection-start-line="44" selection-start-column="42" selection-end-line="44" selection-end-column="42" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="84" column="0" selection-start-line="84" selection-start-column="0" selection-end-line="84" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Video.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.9565217">
-          <caret line="147" column="9" selection-start-line="147" selection-start-column="9" selection-end-line="147" selection-end-column="9" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="docComment;class#SenderHelper#0" expanded="false" />
+            <element signature="method#SendApiMethodAsync#0;class#SenderHelper#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -1853,21 +1698,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SetWebhook.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44254658">
-          <caret line="25" column="51" selection-start-line="25" selection-start-column="51" selection-end-line="25" selection-end-column="51" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendAudio.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44254658">
-          <caret line="21" column="23" selection-start-line="21" selection-start-column="23" selection-end-line="21" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ReplyKeyboardHide.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.23065016">
@@ -1882,13 +1712,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="85" column="43" selection-start-line="85" selection-start-column="43" selection-end-line="85" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.5.4/jackson-databind-2.5.4.jar!/com/fasterxml/jackson/databind/annotation/JsonDeserialize.class">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-5.0">
@@ -1910,13 +1733,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/json/json/20141113/json-20141113-sources.jar!/org/json/JSONObject.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="8.247557">
-          <caret line="279" column="11" selection-start-line="279" selection-start-column="11" selection-end-line="279" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.5.4/jackson-databind-2.5.4-sources.jar!/com/fasterxml/jackson/databind/ObjectMapper.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-15.2443">
@@ -1941,14 +1757,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.3804348">
-          <caret line="96" column="11" selection-start-line="96" selection-start-column="11" selection-end-line="96" selection-end-column="11" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/util/concurrent/CompletableFuture.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.33229813">
@@ -1984,13 +1792,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/SentCallback.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64">
-          <caret line="22" column="81" selection-start-line="22" selection-start-column="81" selection-end-line="22" selection-end-column="81" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.39228296">
@@ -2006,184 +1807,299 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVideo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetMe.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3317647">
+        <state vertical-scroll-proportion="1.1294118">
+          <caret line="42" column="29" selection-start-line="42" selection-start-column="29" selection-end-line="42" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetUpdates.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-1.0117648">
           <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendMessage.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/json/json/20141113/json-20141113-sources.jar!/org/json/JSONObject.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.8117647">
-          <caret line="141" column="20" selection-start-line="122" selection-start-column="8" selection-end-line="141" selection-end-column="20" />
+        <state vertical-scroll-proportion="0.33333334">
+          <caret line="963" column="18" selection-start-line="963" selection-start-column="18" selection-end-line="963" selection-end-column="18" />
           <folding>
-            <element signature="method#enableMarkdown#0;class#SendMessage#0" expanded="false" />
+            <element signature="e#32339#32340#0" expanded="false" />
+            <element signature="e#32385#32386#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.28235295">
-          <caret line="42" column="8" selection-start-line="42" selection-start-column="8" selection-end-line="42" selection-end-column="48" />
+        <state vertical-scroll-proportion="0.41954023">
+          <caret line="192" column="32" selection-start-line="192" selection-start-column="19" selection-end-line="192" selection-end-column="32" />
+          <folding>
+            <element signature="e#8695#8696#0" expanded="false" />
+            <element signature="e#8735#8736#0" expanded="false" />
+            <element signature="e#8776#8777#0" expanded="false" />
+            <element signature="e#8819#8820#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/UpdatesCallback.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.7413333">
+          <caret line="22" column="29" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="29" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java">
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/Number.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334">
+          <caret line="54" column="22" selection-start-line="54" selection-start-column="22" selection-end-line="54" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/Number.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334">
+          <caret line="54" column="22" selection-start-line="54" selection-start-column="22" selection-end-line="54" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/Integer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.49411765">
-          <caret line="58" column="10" selection-start-line="58" selection-start-column="10" selection-end-line="58" selection-end-column="10" />
+        <state vertical-scroll-proportion="0.49333334">
+          <caret line="51" column="37" selection-start-line="51" selection-start-column="37" selection-end-line="51" selection-end-column="37" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetUserProfilePhotos.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="2.24">
+          <caret line="79" column="38" selection-start-line="79" selection-start-column="38" selection-end-line="79" selection-end-column="38" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SetWebhook.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7411765">
-          <caret line="57" column="0" selection-start-line="57" selection-start-column="0" selection-end-line="57" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.44266668">
+          <caret line="25" column="5" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
           <folding>
-            <element signature="method#getSettingsMessage#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getHelpMessage#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getLanguageMessage#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getUnitsMessage#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getChooseNewAlertSetMessage#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getMainMenuKeyboard#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getLanguagesKeyboard#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getUnitsKeyboard#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getSettingsKeyboard#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getRecentsKeyboard#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getRecentsKeyboard#1;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getAlertsKeyboard#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getAlertsListKeyboard#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getForceReply#0;class#WeatherHandlers#0" expanded="false" />
+            <element signature="e#980#981#0" expanded="false" />
+            <element signature="e#1006#1007#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendDocument.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6">
+          <caret line="15" column="82" selection-start-line="15" selection-start-column="82" selection-end-line="15" selection-end-column="82" />
+          <folding>
+            <element signature="e#1420#1421#0" expanded="false" />
+            <element signature="e#1462#1463#0" expanded="false" />
+            <element signature="e#1498#1499#0" expanded="false" />
+            <element signature="e#1530#1531#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/ForwardMessage.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.31764707">
-          <caret line="51" column="48" selection-start-line="51" selection-start-column="48" selection-end-line="51" selection-end-column="48" />
+        <state vertical-scroll-proportion="1.369969">
+          <caret line="79" column="45" selection-start-line="79" selection-start-column="45" selection-end-line="79" selection-end-column="45" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/Main.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendAudio.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.45882353">
-          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.047987618">
+          <caret line="47" column="5" selection-start-line="47" selection-start-column="5" selection-end-line="47" selection-end-column="5" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/UpdatesCallback.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendChatAction.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7411765">
-          <caret line="22" column="29" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="29" />
+        <state vertical-scroll-proportion="1.5789474">
+          <caret line="83" column="31" selection-start-line="83" selection-start-column="31" selection-end-line="83" selection-end-column="31" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/ForwardMessage.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendLocation.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.68235296">
-          <caret line="95" column="20" selection-start-line="92" selection-start-column="8" selection-end-line="95" selection-end-column="20" />
+        <state vertical-scroll-proportion="2.1594427">
+          <caret line="122" column="51" selection-start-line="122" selection-start-column="51" selection-end-line="122" selection-end-column="51" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetMe.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendPhoto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.1294118">
-          <caret line="42" column="29" selection-start-line="42" selection-start-column="29" selection-end-line="42" selection-end-column="29" />
+        <state vertical-scroll-proportion="0.14086688">
+          <caret line="38" column="5" selection-start-line="38" selection-start-column="5" selection-end-line="38" selection-end-column="5" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetUpdates.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendSticker.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.0117648">
-          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+        <state vertical-scroll-proportion="0.23374613">
+          <caret line="35" column="5" selection-start-line="35" selection-start-column="5" selection-end-line="35" selection-end-column="5" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetUserProfilePhotos.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVideo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.9764706">
-          <caret line="79" column="38" selection-start-line="79" selection-start-column="38" selection-end-line="79" selection-end-column="38" />
+        <state vertical-scroll-proportion="0.0015479876">
+          <caret line="35" column="17" selection-start-line="35" selection-start-column="17" selection-end-line="35" selection-end-column="17" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendChatAction.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVoice.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.6588235">
-          <caret line="62" column="20" selection-start-line="59" selection-start-column="8" selection-end-line="62" selection-end-column="20" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="17" column="105" selection-start-line="17" selection-start-column="105" selection-end-line="17" selection-end-column="105" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendLocation.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Chat.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6">
-          <caret line="31" column="32" selection-start-line="31" selection-start-column="32" selection-end-line="31" selection-end-column="32" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="127" column="13" selection-start-line="127" selection-start-column="13" selection-end-line="127" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/SentCallback.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="22" column="81" selection-start-line="22" selection-start-column="81" selection-end-line="22" selection-end-column="81" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/RestApi.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.88235295">
+        <state vertical-scroll-proportion="0.0">
           <caret line="31" column="19" selection-start-line="31" selection-start-column="19" selection-end-line="31" selection-end-column="19" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="84" column="0" selection-start-line="84" selection-start-column="0" selection-end-line="84" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.03529412">
+        <state vertical-scroll-proportion="0.0">
           <caret line="35" column="25" selection-start-line="35" selection-start-column="25" selection-end-line="35" selection-end-column="25" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/File.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3529412">
-          <caret line="17" column="43" selection-start-line="17" selection-start-column="43" selection-end-line="17" selection-end-column="43" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="15" column="96" selection-start-line="15" selection-start-column="96" selection-end-line="15" selection-end-column="96" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetFile.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.45882353">
-          <caret line="20" column="57" selection-start-line="20" selection-start-column="57" selection-end-line="20" selection-end-column="57" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="10" column="50" selection-start-line="10" selection-start-column="50" selection-end-line="10" selection-end-column="50" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="15" column="74" selection-start-line="15" selection-start-column="74" selection-end-line="15" selection-end-column="74" />
+          <caret line="211" column="67" selection-start-line="211" selection-start-column="67" selection-end-line="211" selection-end-column="67" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="15" column="61" selection-start-line="15" selection-start-column="61" selection-end-line="15" selection-end-column="61" />
+          <caret line="237" column="67" selection-start-line="237" selection-start-column="67" selection-end-line="237" selection-end-column="67" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="93" column="75" selection-start-line="93" selection-start-column="75" selection-end-line="93" selection-end-column="75" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/Main.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="32" column="44" selection-start-line="32" selection-start-column="44" selection-end-line="32" selection-end-column="44" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5371517">
-          <caret line="272" column="53" selection-start-line="272" selection-start-column="53" selection-end-line="272" selection-end-column="53" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="259" column="0" selection-start-line="259" selection-start-column="0" selection-end-line="259" selection-end-column="0" />
           <folding>
             <element signature="docComment;class#SenderHelper#0" expanded="false" />
-            <element signature="method#SendDocument#0;class#SenderHelper#0" expanded="false" />
-            <element signature="method#SendPhoto#0;class#SenderHelper#0" expanded="false" />
-            <element signature="method#SendVideo#0;class#SenderHelper#0" expanded="false" />
-            <element signature="method#sendSticker#0;class#SenderHelper#0" expanded="false" />
-            <element signature="method#SendWebhook#0;class#SenderHelper#0" expanded="false" />
+            <element signature="method#SendApiMethodAsync#0;class#SenderHelper#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendMessage.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="147" column="45" selection-start-line="147" selection-start-column="45" selection-end-line="147" selection-end-column="45" />
+          <folding>
+            <element signature="e#1831#1832#0" expanded="true" />
+            <element signature="e#1867#1868#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.21333334">
+          <caret line="123" column="72" selection-start-line="123" selection-start-column="72" selection-end-line="123" selection-end-column="72" />
+          <folding>
+            <element signature="method#getSettingsMessage#0;class#WeatherHandlers#0" expanded="false" />
+            <element signature="method#getHelpMessage#0;class#WeatherHandlers#0" expanded="false" />
+            <element signature="method#getLanguageMessage#0;class#WeatherHandlers#0" expanded="false" />
+            <element signature="method#getUnitsMessage#0;class#WeatherHandlers#0" expanded="false" />
+            <element signature="method#getChooseNewAlertSetMessage#0;class#WeatherHandlers#0" expanded="false" />
+            <element signature="method#getMainMenuKeyboard#0;class#WeatherHandlers#0" expanded="false" />
+            <element signature="method#getLanguagesKeyboard#0;class#WeatherHandlers#0" expanded="false" />
+            <element signature="method#getUnitsKeyboard#0;class#WeatherHandlers#0" expanded="false" />
+            <element signature="method#getSettingsKeyboard#0;class#WeatherHandlers#0" expanded="false" />
+            <element signature="method#getRecentsKeyboard#0;class#WeatherHandlers#0" expanded="false" />
+            <element signature="method#getRecentsKeyboard#1;class#WeatherHandlers#0" expanded="false" />
+            <element signature="method#getAlertsKeyboard#0;class#WeatherHandlers#0" expanded="false" />
+            <element signature="method#getAlertsListKeyboard#0;class#WeatherHandlers#0" expanded="false" />
+            <element signature="method#getForceReply#0;class#WeatherHandlers#0" expanded="false" />
           </folding>
         </state>
       </provider>
diff --git a/src/main/java/org/telegram/SenderHelper.java b/src/main/java/org/telegram/SenderHelper.java
index 841d1b4..2562612 100644
--- a/src/main/java/org/telegram/SenderHelper.java
+++ b/src/main/java/org/telegram/SenderHelper.java
@@ -49,7 +49,11 @@ public class SenderHelper {
 
             if (sendDocument.isNewDocument()) {
                 MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-                builder.addTextBody(SendDocument.CHATID_FIELD, sendDocument.getChatId().toString());
+                if (sendDocument.getChatId() == null) {
+                    builder.addTextBody(SendDocument.CHATID_FIELD, sendDocument.getChannelId());
+                } else {
+                    builder.addTextBody(SendDocument.CHATID_FIELD, sendDocument.getChatId().toString());
+                }
                 builder.addBinaryBody(SendDocument.DOCUMENT_FIELD, new File(sendDocument.getDocument()), ContentType.APPLICATION_OCTET_STREAM, sendDocument.getDocumentName());
                 if (sendDocument.getReplayMarkup() != null) {
                     builder.addTextBody(SendDocument.REPLYMARKUP_FIELD, sendDocument.getReplayMarkup().toJson().toString());
@@ -90,7 +94,7 @@ public class SenderHelper {
 
             if (sendPhoto.isNewPhoto()) {
                 MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-                builder.addTextBody(SendPhoto.CHATID_FIELD, sendPhoto.getChatId().toString());
+                builder.addTextBody(SendPhoto.CHATID_FIELD, sendPhoto.getChatId());
                 builder.addBinaryBody(SendPhoto.PHOTO_FIELD, new File(sendPhoto.getPhoto()), ContentType.APPLICATION_OCTET_STREAM, sendPhoto.getPhotoName());
                 if (sendPhoto.getReplayMarkup() != null) {
                     builder.addTextBody(SendPhoto.REPLYMARKUP_FIELD, sendPhoto.getReplayMarkup().toJson().toString());
@@ -105,7 +109,7 @@ public class SenderHelper {
                 httppost.setEntity(multipart);
             } else {
                 List<NameValuePair> nameValuePairs = new ArrayList<>();
-                nameValuePairs.add(new BasicNameValuePair(SendPhoto.CHATID_FIELD, sendPhoto.getChatId().toString()));
+                nameValuePairs.add(new BasicNameValuePair(SendPhoto.CHATID_FIELD, sendPhoto.getChatId()));
                 nameValuePairs.add(new BasicNameValuePair(SendPhoto.PHOTO_FIELD, sendPhoto.getPhoto()));
                 if (sendPhoto.getReplayMarkup() != null) {
                     nameValuePairs.add(new BasicNameValuePair(SendPhoto.REPLYMARKUP_FIELD, sendPhoto.getReplayMarkup().toString()));
@@ -133,7 +137,7 @@ public class SenderHelper {
 
             if (sendVideo.isNewVideo()) {
                 MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-                builder.addTextBody(SendVideo.CHATID_FIELD, sendVideo.getChatId().toString());
+                builder.addTextBody(SendVideo.CHATID_FIELD, sendVideo.getChatId());
                 builder.addBinaryBody(SendVideo.VIDEO_FIELD, new File(sendVideo.getVideo()), ContentType.APPLICATION_OCTET_STREAM, sendVideo.getVideoName());
                 if (sendVideo.getReplayMarkup() != null) {
                     builder.addTextBody(SendVideo.REPLYMARKUP_FIELD, sendVideo.getReplayMarkup().toJson().toString());
@@ -151,7 +155,7 @@ public class SenderHelper {
                 httppost.setEntity(multipart);
             } else {
                 List<NameValuePair> nameValuePairs = new ArrayList<>();
-                nameValuePairs.add(new BasicNameValuePair(SendVideo.CHATID_FIELD, sendVideo.getChatId().toString()));
+                nameValuePairs.add(new BasicNameValuePair(SendVideo.CHATID_FIELD, sendVideo.getChatId()));
                 nameValuePairs.add(new BasicNameValuePair(SendVideo.VIDEO_FIELD, sendVideo.getVideo()));
                 if (sendVideo.getReplayMarkup() != null) {
                     nameValuePairs.add(new BasicNameValuePair(SendVideo.REPLYMARKUP_FIELD, sendVideo.getReplayMarkup().toString()));
@@ -182,7 +186,7 @@ public class SenderHelper {
 
             if (sendSticker.isNewSticker()) {
                 MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-                builder.addTextBody(SendSticker.CHATID_FIELD, sendSticker.getChatId().toString());
+                builder.addTextBody(SendSticker.CHATID_FIELD, sendSticker.getChatId());
                 builder.addBinaryBody(SendSticker.STICKER_FIELD, new File(sendSticker.getSticker()), ContentType.APPLICATION_OCTET_STREAM, sendSticker.getStickerName());
                 if (sendSticker.getReplayMarkup() != null) {
                     builder.addTextBody(SendSticker.REPLYMARKUP_FIELD, sendSticker.getReplayMarkup().toJson().toString());
@@ -194,7 +198,7 @@ public class SenderHelper {
                 httppost.setEntity(multipart);
             } else {
                 List<NameValuePair> nameValuePairs = new ArrayList<>();
-                nameValuePairs.add(new BasicNameValuePair(SendSticker.CHATID_FIELD, sendSticker.getChatId().toString()));
+                nameValuePairs.add(new BasicNameValuePair(SendSticker.CHATID_FIELD, sendSticker.getChatId()));
                 nameValuePairs.add(new BasicNameValuePair(SendSticker.STICKER_FIELD, sendSticker.getSticker()));
                 if (sendSticker.getReplayMarkup() != null) {
                     nameValuePairs.add(new BasicNameValuePair(SendSticker.REPLYMARKUP_FIELD, sendSticker.getReplayMarkup().toString()));
diff --git a/src/main/java/org/telegram/api/methods/ForwardMessage.java b/src/main/java/org/telegram/api/methods/ForwardMessage.java
index 714afe8..d02f369 100644
--- a/src/main/java/org/telegram/api/methods/ForwardMessage.java
+++ b/src/main/java/org/telegram/api/methods/ForwardMessage.java
@@ -18,7 +18,7 @@ public class ForwardMessage extends BotApiMethod<Message> {
     public static final String PATH = "forwardmessage";
 
     public static final String CHATID_FIELD = "chat_id";
-    private Integer chatId; ///< Unique identifier for the message recepient — User or GroupChat id
+    private String chatId; ///< Unique identifier for the chat to send the message to (or username for channels)
     public static final String FROMCHATID_FIELD = "from_chat_id";
     private Integer fromChatId; ///< Unique identifier for the chat where the original message was sent — User or GroupChat id
     public static final String MESSAGEID_FIELD = "message_id";
@@ -28,11 +28,11 @@ public class ForwardMessage extends BotApiMethod<Message> {
         super();
     }
 
-    public Integer getChatId() {
+    public String getChatId() {
         return chatId;
     }
 
-    public void setChatId(Integer chatId) {
+    public void setChatId(String chatId) {
         this.chatId = chatId;
     }
 
@@ -56,7 +56,7 @@ public class ForwardMessage extends BotApiMethod<Message> {
     public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeStartObject();
         gen.writeStringField(METHOD_FIELD, PATH);
-        gen.writeNumberField(CHATID_FIELD, chatId);
+        gen.writeStringField(CHATID_FIELD, chatId);
         gen.writeNumberField(FROMCHATID_FIELD, fromChatId);
         gen.writeNumberField(MESSAGEID_FIELD, messageId);
         gen.writeEndObject();
@@ -67,7 +67,7 @@ public class ForwardMessage extends BotApiMethod<Message> {
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
         gen.writeStartObject();
         gen.writeStringField(METHOD_FIELD, PATH);
-        gen.writeNumberField(CHATID_FIELD, chatId);
+        gen.writeStringField(CHATID_FIELD, chatId);
         gen.writeNumberField(FROMCHATID_FIELD, fromChatId);
         gen.writeNumberField(MESSAGEID_FIELD, messageId);
         gen.writeEndObject();
diff --git a/src/main/java/org/telegram/api/methods/SendAudio.java b/src/main/java/org/telegram/api/methods/SendAudio.java
index 19fbb53..045dbf9 100644
--- a/src/main/java/org/telegram/api/methods/SendAudio.java
+++ b/src/main/java/org/telegram/api/methods/SendAudio.java
@@ -21,7 +21,7 @@ public class SendAudio {
     public static final String PATH = "sendaudio";
 
     public static final String CHATID_FIELD = "chat_id";
-    private Integer chatId; ///< Unique identifier for the message recepient — User or GroupChat id
+    private String chatId; ///< Unique identifier for the chat to send the message to (or Username fro channels)
     public static final String AUDIO_FIELD = "audio";
     private String audio; ///< Audio file to send. file_id as String to resend an audio that is already on the Telegram servers
     public static final String REPLYTOMESSAGEID_FIELD = "reply_to_message_id";
@@ -39,11 +39,11 @@ public class SendAudio {
         super();
     }
 
-    public Integer getChatId() {
+    public String getChatId() {
         return chatId;
     }
 
-    public void setChatId(Integer chatId) {
+    public void setChatId(String chatId) {
         this.chatId = chatId;
     }
 
diff --git a/src/main/java/org/telegram/api/methods/SendChatAction.java b/src/main/java/org/telegram/api/methods/SendChatAction.java
index d5b11fc..d983683 100644
--- a/src/main/java/org/telegram/api/methods/SendChatAction.java
+++ b/src/main/java/org/telegram/api/methods/SendChatAction.java
@@ -20,7 +20,7 @@ public class SendChatAction extends BotApiMethod<Boolean>{
     public static final String PATH = "sendChatAction";
 
     public static final String CHATID_FIELD = "chat_id";
-    private Integer chatId; ///< Unique identifier for the message recepient — User or GroupChat id
+    private String chatId; ///< Unique identifier for the chat to send the message to (Or username for channels)
     public static final String ACTION_FIELD = "action";
     /**
      * Type of action to broadcast.
@@ -34,11 +34,11 @@ public class SendChatAction extends BotApiMethod<Boolean>{
      */
     private String action;
 
-    public Integer getChatId() {
+    public String getChatId() {
         return chatId;
     }
 
-    public void setChatId(Integer chatId) {
+    public void setChatId(String chatId) {
         this.chatId = chatId;
     }
 
@@ -74,7 +74,7 @@ public class SendChatAction extends BotApiMethod<Boolean>{
     @Override
     public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeStartObject();
-        gen.writeNumberField(CHATID_FIELD, chatId);
+        gen.writeStringField(CHATID_FIELD, chatId);
         gen.writeStringField(ACTION_FIELD, action);
         gen.writeEndObject();
     }
@@ -82,7 +82,7 @@ public class SendChatAction extends BotApiMethod<Boolean>{
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
         gen.writeStartObject();
-        gen.writeNumberField(CHATID_FIELD, chatId);
+        gen.writeStringField(CHATID_FIELD, chatId);
         gen.writeStringField(ACTION_FIELD, action);
         gen.writeEndObject();
     }
diff --git a/src/main/java/org/telegram/api/methods/SendDocument.java b/src/main/java/org/telegram/api/methods/SendDocument.java
index 8e5a959..a106ecb 100644
--- a/src/main/java/org/telegram/api/methods/SendDocument.java
+++ b/src/main/java/org/telegram/api/methods/SendDocument.java
@@ -12,7 +12,8 @@ public class SendDocument {
     public static final String PATH = "senddocument";
 
     public static final String CHATID_FIELD = "chat_id";
-    private Integer chatId; ///< Unique identifier for the message recepient — User or GroupChat id
+    private Integer chatId; ///< Unique identifier for the chat to send the message to
+    private String channelId; ///< Username for the channel to send the message to
     public static final String DOCUMENT_FIELD = "document";
     private String document; ///< File file to send. file_id as String to resend a file that is already on the Telegram servers
     public static final String REPLYTOMESSAGEID_FIELD = "reply_to_message_id";
@@ -35,6 +36,14 @@ public class SendDocument {
         this.chatId = chatId;
     }
 
+    public void setChatId(String channelId) {
+        this.channelId = channelId;
+    }
+
+    public String getChannelId() {
+        return channelId;
+    }
+
     public String getDocument() {
         return document;
     }
diff --git a/src/main/java/org/telegram/api/methods/SendLocation.java b/src/main/java/org/telegram/api/methods/SendLocation.java
index 5f1b7da..81a9a3d 100644
--- a/src/main/java/org/telegram/api/methods/SendLocation.java
+++ b/src/main/java/org/telegram/api/methods/SendLocation.java
@@ -19,7 +19,7 @@ public class SendLocation extends BotApiMethod<Message> {
     public static final String PATH = "sendlocation";
 
     public static final String CHATID_FIELD = "chat_id";
-    private Integer chatId; ///< Unique identifier for the message recepient — User or GroupChat id
+    private String chatId; ///< Unique identifier for the chat to send the message to (Or username for channels)
     public static final String LATITUDE_FIELD = "latitude";
     private Float latitude; ///< Latitude of location
     public static final String LONGITUDE_FIELD = "longitude";
@@ -29,11 +29,11 @@ public class SendLocation extends BotApiMethod<Message> {
     public static final String REPLYMARKUP_FIELD = "reply_markup";
     private ReplyKeyboard replayMarkup; ///< Optional. JSON-serialized object for a custom reply keyboard
 
-    public Integer getChatId() {
+    public String getChatId() {
         return chatId;
     }
 
-    public void setChatId(Integer chatId) {
+    public void setChatId(String chatId) {
         this.chatId = chatId;
     }
 
@@ -85,7 +85,6 @@ public class SendLocation extends BotApiMethod<Message> {
     @Override
     public JSONObject toJson() {
         JSONObject jsonObject = new JSONObject();
-
         jsonObject.put(CHATID_FIELD, chatId);
         jsonObject.put(LATITUDE_FIELD, latitude);
         jsonObject.put(LONGITUDE_FIELD, longitude);
@@ -103,7 +102,7 @@ public class SendLocation extends BotApiMethod<Message> {
     public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeStartObject();
         gen.writeStringField(METHOD_FIELD, PATH);
-        gen.writeNumberField(CHATID_FIELD, chatId);
+        gen.writeStringField(CHATID_FIELD, chatId);
         gen.writeNumberField(LATITUDE_FIELD, latitude);
         gen.writeNumberField(LONGITUDE_FIELD, longitude);
         if (replayToMessageId != null) {
@@ -121,7 +120,7 @@ public class SendLocation extends BotApiMethod<Message> {
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
         gen.writeStartObject();
         gen.writeStringField(METHOD_FIELD, PATH);
-        gen.writeNumberField(CHATID_FIELD, chatId);
+        gen.writeStringField(CHATID_FIELD, chatId);
         gen.writeNumberField(LATITUDE_FIELD, latitude);
         gen.writeNumberField(LONGITUDE_FIELD, longitude);
         if (replayToMessageId != null) {
diff --git a/src/main/java/org/telegram/api/methods/SendMessage.java b/src/main/java/org/telegram/api/methods/SendMessage.java
index 907dfa4..80c84a7 100644
--- a/src/main/java/org/telegram/api/methods/SendMessage.java
+++ b/src/main/java/org/telegram/api/methods/SendMessage.java
@@ -19,7 +19,7 @@ public class SendMessage extends BotApiMethod<Message> {
     public static final String PATH = "sendmessage";
 
     public static final String CHATID_FIELD = "chat_id";
-    private Integer chatId; ///< Unique identifier for the message recepient — User or GroupChat id
+    private String chatId; ///< Unique identifier for the chat to send the message to (Or username for channels)
     public static final String TEXT_FIELD = "text";
     private String text; ///< Text of the message to be sent
     public static final String PARSEMODE_FIELD = "parse_mode";
@@ -35,11 +35,11 @@ public class SendMessage extends BotApiMethod<Message> {
         super();
     }
 
-    public Integer getChatId() {
+    public String getChatId() {
         return chatId;
     }
 
-    public void setChatId(Integer chatId) {
+    public void setChatId(String chatId) {
         this.chatId = chatId;
     }
 
@@ -86,7 +86,6 @@ public class SendMessage extends BotApiMethod<Message> {
     @Override
     public JSONObject toJson() {
         JSONObject jsonObject = new JSONObject();
-
         jsonObject.put(CHATID_FIELD, chatId);
         jsonObject.put(TEXT_FIELD, text);
         if (parseMode != null) {
@@ -122,7 +121,7 @@ public class SendMessage extends BotApiMethod<Message> {
     public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeStartObject();
         gen.writeStringField(METHOD_FIELD, PATH);
-        gen.writeNumberField(CHATID_FIELD, chatId);
+        gen.writeStringField(CHATID_FIELD, chatId);
         gen.writeStringField(TEXT_FIELD, text);
 
         if (parseMode != null) {
@@ -146,7 +145,7 @@ public class SendMessage extends BotApiMethod<Message> {
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
         gen.writeStartObject();
         gen.writeStringField(METHOD_FIELD, PATH);
-        gen.writeNumberField(CHATID_FIELD, chatId);
+        gen.writeStringField(CHATID_FIELD, chatId);
         gen.writeStringField(TEXT_FIELD, text);
 
         if (parseMode != null) {
diff --git a/src/main/java/org/telegram/api/methods/SendPhoto.java b/src/main/java/org/telegram/api/methods/SendPhoto.java
index 06adc91..af128a9 100644
--- a/src/main/java/org/telegram/api/methods/SendPhoto.java
+++ b/src/main/java/org/telegram/api/methods/SendPhoto.java
@@ -12,7 +12,7 @@ public class SendPhoto {
     public static final String PATH = "sendphoto";
 
     public static final String CHATID_FIELD = "chat_id";
-    private Integer chatId; ///< Unique identifier for the message recepient — User or GroupChat id
+    private String chatId; ///< Unique identifier for the chat to send the message to (Or username for channels)
     public static final String PHOTO_FIELD = "photo";
     private String photo; ///< Photo to send. file_id as String to resend a photo that is already on the Telegram servers
     public static final String CAPTION_FIELD = "photo";
@@ -30,11 +30,11 @@ public class SendPhoto {
         super();
     }
 
-    public Integer getChatId() {
+    public String getChatId() {
         return chatId;
     }
 
-    public void setChatId(Integer chatId) {
+    public void setChatId(String chatId) {
         this.chatId = chatId;
     }
 
diff --git a/src/main/java/org/telegram/api/methods/SendSticker.java b/src/main/java/org/telegram/api/methods/SendSticker.java
index 77d7f39..5e9ed96 100644
--- a/src/main/java/org/telegram/api/methods/SendSticker.java
+++ b/src/main/java/org/telegram/api/methods/SendSticker.java
@@ -12,7 +12,7 @@ public class SendSticker {
     public static final String PATH = "sendsticker";
 
     public static final String CHATID_FIELD = "chat_id";
-    private Integer chatId; ///< Unique identifier for the message recepient — User or GroupChat id
+    private String chatId; ///< Unique identifier for the chat to send the message to (Or username for channels)
     public static final String STICKER_FIELD = "sticker";
     private String sticker; ///< Sticker file to send. file_id as String to resend a sticker that is already on the Telegram servers
     public static final String REPLYTOMESSAGEID_FIELD = "reply_to_message_id";
@@ -27,11 +27,11 @@ public class SendSticker {
         super();
     }
 
-    public Integer getChatId() {
+    public String getChatId() {
         return chatId;
     }
 
-    public void setChatId(Integer chatId) {
+    public void setChatId(String chatId) {
         this.chatId = chatId;
     }
 
diff --git a/src/main/java/org/telegram/api/methods/SendVideo.java b/src/main/java/org/telegram/api/methods/SendVideo.java
index 98b7593..02dbd77 100644
--- a/src/main/java/org/telegram/api/methods/SendVideo.java
+++ b/src/main/java/org/telegram/api/methods/SendVideo.java
@@ -14,7 +14,7 @@ public class SendVideo {
     public static final String PATH = "sendvideo";
 
     public static final String CHATID_FIELD = "chat_id";
-    private Integer chatId; ///< Unique identifier for the message recepient — User or GroupChat id
+    private String chatId; ///< Unique identifier for the chat to send the message to (Or username for channels)
     public static final String VIDEO_FIELD = "video";
     private String video; ///< Video to send. file_id as String to resend a video that is already on the Telegram servers
     public static final String DURATION_FIELD = "duration";
@@ -33,11 +33,11 @@ public class SendVideo {
         super();
     }
 
-    public Integer getChatId() {
+    public String getChatId() {
         return chatId;
     }
 
-    public void setChatId(Integer chatId) {
+    public void setChatId(String chatId) {
         this.chatId = chatId;
     }
 
diff --git a/src/main/java/org/telegram/api/methods/SendVoice.java b/src/main/java/org/telegram/api/methods/SendVoice.java
index 9e9a225..d8501df 100644
--- a/src/main/java/org/telegram/api/methods/SendVoice.java
+++ b/src/main/java/org/telegram/api/methods/SendVoice.java
@@ -15,7 +15,7 @@ public class SendVoice {
     public static final String PATH = "sendvoice";
 
     public static final String CHATID_FIELD = "chat_id";
-    private Integer chatId; ///< Unique identifier for the message recepient — User or GroupChat id
+    private String chatId; ///< Unique identifier for the chat sent message to (Or username for channels)
     public static final String AUDIO_FIELD = "audio";
     private String audio; ///< Audio file to send. file_id as String to resend an audio that is already on the Telegram servers
     public static final String REPLYTOMESSAGEID_FIELD = "reply_to_message_id";
diff --git a/src/main/java/org/telegram/api/objects/Chat.java b/src/main/java/org/telegram/api/objects/Chat.java
index 7e2e6a2..c718c03 100644
--- a/src/main/java/org/telegram/api/objects/Chat.java
+++ b/src/main/java/org/telegram/api/objects/Chat.java
@@ -16,22 +16,28 @@ import java.io.IOException;
  * @date 24 of June of 2015
  */
 public class Chat implements BotApiObject {
+    private static final String USERCHATTYPE = "private";
+    private static final String GROUPCHATTYPE = "group";
+    private static final String CHANNELCHATTYPE = "channel";
 
     public static final String ID_FIELD = "id";
     @JsonProperty(ID_FIELD)
-    private Integer id; ///< Unique identifier for this chat
+    private Integer id; ///< Unique identifier for this chat, not exciding 1e13 by absolute value
+    public static final String TYPE_FIELD = "type";
+    @JsonProperty(TYPE_FIELD)
+    private String type; ///< Type of the chat, one of “private”, “group” or “channel”
     public static final String TITLE_FIELD = "title";
     @JsonProperty(TITLE_FIELD)
-    private String title; ///< Group name
+    private String title; ///< Optional. Title of the chat, only for channels and group chat
     public static final String FIRSTNAME_FIELD = "first_name";
     @JsonProperty(FIRSTNAME_FIELD)
-    private String firstName; ///< User‘s or bot’s first name
+    private String firstName; ///< Optional. Username of the chat, only for private chats and channels if available
     public static final String LASTNAME_FIELD = "last_name";
     @JsonProperty(LASTNAME_FIELD)
-    private String lastName; ///< Optional. User‘s or bot’s last name
+    private String lastName; ///< Optional. Interlocutor's first name for private chats
     public static final String USERNAME_FIELD = "username";
     @JsonProperty(USERNAME_FIELD)
-    private String userName; ///< Optional. User‘s or bot’s username
+    private String userName; ///< Optional. Interlocutor's last name for private chats
 
     public Chat() {
         super();
@@ -40,17 +46,19 @@ public class Chat implements BotApiObject {
     public Chat(JSONObject jsonObject) {
         super();
         this.id = jsonObject.getInt(ID_FIELD);
-        if (this.id > 0) {
-            this.firstName = jsonObject.getString(FIRSTNAME_FIELD);
-            if (jsonObject.has(LASTNAME_FIELD)) {
-                this.lastName = jsonObject.getString(LASTNAME_FIELD);
-            }
-            if (jsonObject.has(USERNAME_FIELD)) {
-                this.userName = jsonObject.getString(USERNAME_FIELD);
-            }
-        } else {
+        this.type = jsonObject.getString(TYPE_FIELD);
+        if (jsonObject.has(TITLE_FIELD)) {
             this.title = jsonObject.getString(TITLE_FIELD);
         }
+        if (jsonObject.has(FIRSTNAME_FIELD)) {
+            this.firstName = jsonObject.getString(FIRSTNAME_FIELD);
+        }
+        if (jsonObject.has(LASTNAME_FIELD)) {
+            this.lastName = jsonObject.getString(LASTNAME_FIELD);
+        }
+        if (jsonObject.has(USERNAME_FIELD)) {
+            this.userName = jsonObject.getString(USERNAME_FIELD);
+        }
     }
 
     public Integer getId() {
@@ -58,11 +66,15 @@ public class Chat implements BotApiObject {
     }
 
     public Boolean isGroupChat() {
-        if (id < 0) {
-            return true;
-        } else {
-            return false;
-        }
+        return GROUPCHATTYPE.equals(type);
+    }
+
+    public Boolean isChannelChat() {
+        return CHANNELCHATTYPE.equals(type);
+    }
+
+    public Boolean isUserChat() {
+        return USERCHATTYPE.equals(type);
     }
 
     public String getTitle() {
@@ -85,12 +97,21 @@ public class Chat implements BotApiObject {
     public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeStartObject();
         gen.writeNumberField(ID_FIELD, id);
-        if (id > 0) {
-            gen.writeStringField(FIRSTNAME_FIELD, firstName);
-            gen.writeStringField(LASTNAME_FIELD, lastName);
-            gen.writeStringField(USERNAME_FIELD, userName);
+        gen.writeStringField(TYPE_FIELD, type);
+        if (isUserChat()) {
+            if (firstName != null) {
+                gen.writeStringField(FIRSTNAME_FIELD, firstName);
+            }
+            if (lastName != null) {
+                gen.writeStringField(LASTNAME_FIELD, lastName);
+            }
         } else {
-            gen.writeStringField(TITLE_FIELD, title);
+            if (title != null) {
+                gen.writeStringField(TITLE_FIELD, title);
+            }
+        }
+        if (!isGroupChat() && userName != null) {
+            gen.writeStringField(USERNAME_FIELD, userName);
         }
         gen.writeEndObject();
         gen.flush();
@@ -100,12 +121,21 @@ public class Chat implements BotApiObject {
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
         gen.writeStartObject();
         gen.writeNumberField(ID_FIELD, id);
-        if (id > 0) {
-            gen.writeStringField(FIRSTNAME_FIELD, firstName);
-            gen.writeStringField(LASTNAME_FIELD, lastName);
-            gen.writeStringField(USERNAME_FIELD, userName);
+        gen.writeStringField(TYPE_FIELD, type);
+        if (isUserChat()) {
+            if (firstName != null) {
+                gen.writeStringField(FIRSTNAME_FIELD, firstName);
+            }
+            if (lastName != null) {
+                gen.writeStringField(LASTNAME_FIELD, lastName);
+            }
         } else {
-            gen.writeStringField(TITLE_FIELD, title);
+            if (title != null) {
+                gen.writeStringField(TITLE_FIELD, title);
+            }
+        }
+        if (!isGroupChat() && userName != null) {
+            gen.writeStringField(USERNAME_FIELD, userName);
         }
         gen.writeEndObject();
         gen.flush();
diff --git a/src/main/java/org/telegram/api/objects/Message.java b/src/main/java/org/telegram/api/objects/Message.java
index e6e66b7..9ada2d3 100644
--- a/src/main/java/org/telegram/api/objects/Message.java
+++ b/src/main/java/org/telegram/api/objects/Message.java
@@ -24,17 +24,13 @@ public class Message implements BotApiObject {
     private Integer messageId; ///< Integer	Unique message identifier
     public static final String FROM_FIELD = "from";
     @JsonProperty(FROM_FIELD)
-    private User from; ///< Sender
+    private User from; ///< Optional. Sender, can be empty for messages sent to channels
     public static final String DATE_FIELD = "date";
     @JsonProperty(DATE_FIELD)
     private Integer date; ///< Date the message was sent in Unix time
     public static final String CHAT_FIELD = "chat";
-    /**
-     * Conversation the message belongs to in case of a private message (@see User)or
-     * Conversation the message belongs to in case of a group (@see GroupChat)
-     */
     @JsonProperty(CHAT_FIELD)
-    private Chat chat; ///< Conversation the message belongs to in case of a private message
+    private Chat chat; ///< Conversation the message belongs to
     public static final String FORWARDFROM_FIELD = "forward_from";
     @JsonProperty(FORWARDFROM_FIELD)
     private User forwardFrom; ///< Optional. For forwarded messages, sender of the original message
@@ -73,13 +69,13 @@ public class Message implements BotApiObject {
     private User leftChatParticipant; ///< Optional. A member was removed from the group, information about them (this member may be bot itself)
     public static final String NEWCHATTITLE_FIELD = "new_chat_title";
     @JsonProperty(NEWCHATTITLE_FIELD)
-    private String newChatTitle; ///< Optional. A group title was changed to this value
+    private String newChatTitle; ///< Optional. A chat title was changed to this value
     public static final String NEWCHATPHOTO_FIELD = "new_chat_photo";
     @JsonProperty(NEWCHATPHOTO_FIELD)
-    private List<PhotoSize> newChatPhoto; ///< Optional. A group photo was change to this value
+    private List<PhotoSize> newChatPhoto; ///< Optional. A chat photo was change to this value
     public static final String DELETECHATPHOTO_FIELD = "delete_chat_photo";
     @JsonProperty(DELETECHATPHOTO_FIELD)
-    private Boolean deleteChatPhoto; ///< Optional. Informs that the group photo was deleted
+    private Boolean deleteChatPhoto; ///< Optional. Informs that the chat photo was deleted
     public static final String GROUPCHATCREATED_FIELD = "group_chat_created";
     @JsonProperty(GROUPCHATCREATED_FIELD)
     private Boolean groupchatCreated; ///< Optional. Informs that the group has been created
@@ -97,7 +93,9 @@ public class Message implements BotApiObject {
     public Message(JSONObject jsonObject) {
         super();
         this.messageId = jsonObject.getInt(MESSAGEID_FIELD);
-        this.from = new User(jsonObject.getJSONObject(FROM_FIELD));
+        if (jsonObject.has(FROM_FIELD)) {
+            this.from = new User(jsonObject.getJSONObject(FROM_FIELD));
+        }
         this.date = jsonObject.getInt(DATE_FIELD);
         this.chat = new Chat(jsonObject.getJSONObject(CHAT_FIELD));
         if (jsonObject.has(FORWARDFROM_FIELD)) {
@@ -192,6 +190,14 @@ public class Message implements BotApiObject {
         return chat.isGroupChat();
     }
 
+    public boolean isUserMessage() {
+        return chat.isUserChat();
+    }
+
+    public boolean isChannelMessage() {
+        return chat.isChannelChat();
+    }
+
     public Integer getChatId() {
         return chat.getId();
     }
diff --git a/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java b/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java
index 38658f2..7af5165 100644
--- a/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java
+++ b/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java
@@ -33,7 +33,7 @@ public class DirectionsHandlers implements UpdatesCallback {
     private final ConcurrentLinkedQueue<Integer> languageMessages = new ConcurrentLinkedQueue<>();
 
     public DirectionsHandlers(Webhook webhook) {
-        if (USEWEBHOOK) {
+        if (USEWEBHOOK && BuildVars.useWebHook) {
             webhook.registerWebhook(this, BOTNAME);
             SenderHelper.SendWebhook(Webhook.getExternalURL(BOTNAME), TOKEN);
         } else {
@@ -84,7 +84,7 @@ public class DirectionsHandlers implements UpdatesCallback {
                         } else {
                             SendMessage sendMessageRequest = new SendMessage();
                             sendMessageRequest.setText(LocalisationService.getInstance().getString("youNeedReplyDirections", language));
-                            sendMessageRequest.setChatId(message.getChatId());
+                            sendMessageRequest.setChatId(message.getChatId().toString());
                             SenderHelper.SendApiMethod(sendMessageRequest, TOKEN);
                         }
                     }
@@ -98,7 +98,7 @@ public class DirectionsHandlers implements UpdatesCallback {
         String destiny = message.getText();
         List<String> directions = DirectionsService.getInstance().getDirections(origin, destiny, language);
         SendMessage sendMessageRequest = new SendMessage();
-        sendMessageRequest.setChatId(message.getChatId());
+        sendMessageRequest.setChatId(message.getChatId().toString());
         ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide();
         replyKeyboardHide.setSelective(true);
         sendMessageRequest.setReplayMarkup(replyKeyboardHide);
@@ -125,7 +125,7 @@ public class DirectionsHandlers implements UpdatesCallback {
 
     private void onOriginReceived(Message message, String language) {
         SendMessage sendMessageRequest = new SendMessage();
-        sendMessageRequest.setChatId(message.getChatId());
+        sendMessageRequest.setChatId(message.getChatId().toString());
         sendMessageRequest.setReplayToMessageId(message.getMessageId());
         ForceReplyKeyboard forceReplyKeyboard = new ForceReplyKeyboard();
         forceReplyKeyboard.setSelective(true);
@@ -155,13 +155,13 @@ public class DirectionsHandlers implements UpdatesCallback {
                 LocalisationService.getInstance().getString("helpDirections", language),
                 Commands.startDirectionCommand);
         sendMessageRequest.setText(helpDirectionsFormated);
-        sendMessageRequest.setChatId(message.getChatId());
+        sendMessageRequest.setChatId(message.getChatId().toString());
         SenderHelper.SendApiMethod(sendMessageRequest, TOKEN);
     }
 
     private void onStartdirectionsCommand(Message message, String language) {
         SendMessage sendMessageRequest = new SendMessage();
-        sendMessageRequest.setChatId(message.getChatId());
+        sendMessageRequest.setChatId(message.getChatId().toString());
         sendMessageRequest.setReplayToMessageId(message.getMessageId());
         ForceReplyKeyboard forceReplyKeyboard = new ForceReplyKeyboard();
         forceReplyKeyboard.setSelective(true);
@@ -187,7 +187,7 @@ public class DirectionsHandlers implements UpdatesCallback {
 
     private void onSetLanguageCommand(Message message, String language) {
         SendMessage sendMessageRequest = new SendMessage();
-        sendMessageRequest.setChatId(message.getChatId());
+        sendMessageRequest.setChatId(message.getChatId().toString());
         ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup();
         HashMap<String, String> languages = LocalisationService.getInstance().getSupportedLanguages();
         List<List<String>> commands = new ArrayList<>();
@@ -209,7 +209,7 @@ public class DirectionsHandlers implements UpdatesCallback {
     private void onLanguageSelected(Message message) {
         String[] parts = message.getText().split("-->", 2);
         SendMessage sendMessageRequest = new SendMessage();
-        sendMessageRequest.setChatId(message.getChatId());
+        sendMessageRequest.setChatId(message.getChatId().toString());
         if (LocalisationService.getInstance().getSupportedLanguages().containsKey(parts[0].trim())) {
             DatabaseManager.getInstance().putUserLanguage(message.getFrom().getId(), parts[0].trim());
             sendMessageRequest.setText(LocalisationService.getInstance().getString("languageModified", parts[0].trim()));
diff --git a/src/main/java/org/telegram/updateshandlers/FilesHandlers.java b/src/main/java/org/telegram/updateshandlers/FilesHandlers.java
index 391e249..433ce9c 100644
--- a/src/main/java/org/telegram/updateshandlers/FilesHandlers.java
+++ b/src/main/java/org/telegram/updateshandlers/FilesHandlers.java
@@ -40,7 +40,7 @@ public class FilesHandlers implements UpdatesCallback {
     private final ConcurrentLinkedQueue<Integer> languageMessages = new ConcurrentLinkedQueue<>();
 
     public FilesHandlers(Webhook webhook) {
-        if (USEWEBHOOK) {
+        if (USEWEBHOOK && BuildVars.useWebHook) {
             webhook.registerWebhook(this, BOTNAME);
             SenderHelper.SendWebhook(Webhook.getExternalURL(BOTNAME), TOKEN);
         } else {
@@ -99,7 +99,7 @@ public class FilesHandlers implements UpdatesCallback {
             SendMessage sendMessageRequest = new SendMessage();
             sendMessageRequest.setText(LocalisationService.getInstance().getString("fileUploaded", language) +
                     LocalisationService.getInstance().getString("uploadedFileURL", language) + message.getDocument().getFileId());
-            sendMessageRequest.setChatId(message.getChatId());
+            sendMessageRequest.setChatId(message.getChatId().toString());
             SenderHelper.SendApiMethod(sendMessageRequest, TOKEN);
         }
     }
@@ -117,7 +117,7 @@ public class FilesHandlers implements UpdatesCallback {
         } else {
             sendMessageRequest.setText(LocalisationService.getInstance().getString("noFiles", language));
         }
-        sendMessageRequest.setChatId(message.getChatId());
+        sendMessageRequest.setChatId(message.getChatId().toString());
         ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide();
         replyKeyboardHide.setHideKeyboard(true);
         sendMessageRequest.setReplayMarkup(replyKeyboardHide);
@@ -137,7 +137,7 @@ public class FilesHandlers implements UpdatesCallback {
         DatabaseManager.getInstance().addUserForFile(message.getFrom().getId(), DELETE_UPLOADED_STATUS);
         SendMessage sendMessageRequest = new SendMessage();
         sendMessageRequest.setText(LocalisationService.getInstance().getString("deleteUploadedFile", language));
-        sendMessageRequest.setChatId(message.getChatId());
+        sendMessageRequest.setChatId(message.getChatId().toString());
         HashMap<String, String> files = DatabaseManager.getInstance().getFilesByUser(message.getFrom().getId());
         ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup();
         if (files.size() > 0) {
@@ -165,7 +165,7 @@ public class FilesHandlers implements UpdatesCallback {
         } else {
             sendMessageRequest.setText(LocalisationService.getInstance().getString("wrongFileId", language));
         }
-        sendMessageRequest.setChatId(message.getChatId());
+        sendMessageRequest.setChatId(message.getChatId().toString());
         SenderHelper.SendApiMethod(sendMessageRequest, TOKEN);
         DatabaseManager.getInstance().deleteUserForFile(message.getFrom().getId());
     }
@@ -174,7 +174,7 @@ public class FilesHandlers implements UpdatesCallback {
         DatabaseManager.getInstance().deleteUserForFile(message.getFrom().getId());
         SendMessage sendMessageRequest = new SendMessage();
         sendMessageRequest.setText(LocalisationService.getInstance().getString("processFinished", language));
-        sendMessageRequest.setChatId(message.getChatId());
+        sendMessageRequest.setChatId(message.getChatId().toString());
         SenderHelper.SendApiMethod(sendMessageRequest, TOKEN);
     }
 
@@ -182,7 +182,7 @@ public class FilesHandlers implements UpdatesCallback {
         DatabaseManager.getInstance().addUserForFile(message.getFrom().getId(), INITIAL_UPLOAD_STATUS);
         SendMessage sendMessageRequest = new SendMessage();
         sendMessageRequest.setText(LocalisationService.getInstance().getString("sendFileToUpload", language));
-        sendMessageRequest.setChatId(message.getChatId());
+        sendMessageRequest.setChatId(message.getChatId().toString());
         SenderHelper.SendApiMethod(sendMessageRequest, TOKEN);
     }
 
@@ -193,7 +193,7 @@ public class FilesHandlers implements UpdatesCallback {
                 Commands.startCommand, Commands.uploadCommand, Commands.deleteCommand,
                 Commands.listCommand);
         sendMessageRequest.setText(formatedString);
-        sendMessageRequest.setChatId(message.getChatId());
+        sendMessageRequest.setChatId(message.getChatId().toString());
         SenderHelper.SendApiMethod(sendMessageRequest, TOKEN);
     }
 
@@ -206,14 +206,14 @@ public class FilesHandlers implements UpdatesCallback {
         } else {
             SendMessage sendMessageRequest = new SendMessage();
             sendMessageRequest.setText(LocalisationService.getInstance().getString("wrongFileId", language));
-            sendMessageRequest.setChatId(message.getChatId());
+            sendMessageRequest.setChatId(message.getChatId().toString());
             SenderHelper.SendApiMethod(sendMessageRequest, TOKEN);
         }
     }
 
     private void onSetLanguageCommand(Message message, String language) {
         SendMessage sendMessageRequest = new SendMessage();
-        sendMessageRequest.setChatId(message.getChatId());
+        sendMessageRequest.setChatId(message.getChatId().toString());
         ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup();
         HashMap<String, String> languages = LocalisationService.getInstance().getSupportedLanguages();
         List<List<String>> commands = new ArrayList<>();
@@ -235,7 +235,7 @@ public class FilesHandlers implements UpdatesCallback {
     private void onLanguageReceived(Message message) {
         String[] parts = message.getText().split(Emoji.LEFT_RIGHT_ARROW.toString(), 2);
         SendMessage sendMessageRequest = new SendMessage();
-        sendMessageRequest.setChatId(message.getChatId());
+        sendMessageRequest.setChatId(message.getChatId().toString());
         if (LocalisationService.getInstance().getSupportedLanguages().containsKey(parts[0].trim())) {
             DatabaseManager.getInstance().putUserLanguage(message.getFrom().getId(), parts[0].trim());
             sendMessageRequest.setText(LocalisationService.getInstance().getString("languageModified", parts[0].trim()));
diff --git a/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java b/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java
index c7e1cd6..01d29f4 100644
--- a/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java
+++ b/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java
@@ -24,7 +24,7 @@ public class TransifexHandlers implements UpdatesCallback {
     private static final boolean USEWEBHOOK = false;
 
     public TransifexHandlers(Webhook webhook) {
-        if (USEWEBHOOK) {
+        if (USEWEBHOOK && BuildVars.useWebHook) {
             webhook.registerWebhook(this, BOTNAME);
             SenderHelper.SendWebhook(Webhook.getExternalURL(BOTNAME), TOKEN);
         } else {
@@ -74,7 +74,7 @@ public class TransifexHandlers implements UpdatesCallback {
                             Commands.transifexTDesktop, Commands.transifexOSX, Commands.transifexWP,
                             Commands.transifexAndroidSupportCommand);
                     sendMessageRequest.setText(helpFormated);
-                    sendMessageRequest.setChatId(message.getChatId());
+                    sendMessageRequest.setChatId(message.getChatId().toString());
                     SenderHelper.SendApiMethod(sendMessageRequest, TOKEN);
                 }
 
@@ -91,7 +91,7 @@ public class TransifexHandlers implements UpdatesCallback {
                         Commands.transifexTDesktop, Commands.transifexOSX, Commands.transifexWP,
                         Commands.transifexAndroidSupportCommand);
                 sendMessageRequest.setText(helpFormated);
-                sendMessageRequest.setChatId(message.getChatId());
+                sendMessageRequest.setChatId(message.getChatId().toString());
                 SenderHelper.SendApiMethod(sendMessageRequest, TOKEN);
             }
         }
diff --git a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
index 8f88009..7793479 100644
--- a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
+++ b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
@@ -46,7 +46,7 @@ public class WeatherHandlers implements UpdatesCallback {
     private final Object webhookLock = new Object();
 
     public WeatherHandlers(Webhook webhook) {
-        if (USEWEBHOOK) {
+        if (USEWEBHOOK && BuildVars.useWebHook) {
             webhook.registerWebhook(this, BOTNAME);
             SenderHelper.SendWebhook(Webhook.getExternalURL(BOTNAME), TOKEN);
         } else {
@@ -80,7 +80,7 @@ public class WeatherHandlers implements UpdatesCallback {
                     weatherAlert.getUserId(), userOptions[0], userOptions[1]);
             SendMessage sendMessage = new SendMessage();
             sendMessage.enableMarkdown(true);
-            sendMessage.setChatId(weatherAlert.getUserId());
+            sendMessage.setChatId(String.valueOf(weatherAlert.getUserId()));
             sendMessage.setText(weather);
             sendBuiltMessage(sendMessage);
         }
@@ -108,7 +108,7 @@ public class WeatherHandlers implements UpdatesCallback {
 
     private static BotApiMethod onCancelCommand(Integer chatId, Integer userId, Integer messageId, ReplyKeyboard replyKeyboard, String language) {
         SendMessage sendMessage = new SendMessage();
-        sendMessage.setChatId(chatId);
+        sendMessage.setChatId(chatId.toString());
         sendMessage.enableMarkdown(true);
         sendMessage.setReplayMarkup(getMainMenuKeyboard(language));
         sendMessage.setReplayToMessageId(messageId);
@@ -124,7 +124,7 @@ public class WeatherHandlers implements UpdatesCallback {
     private static BotApiMethod handleIncomingMessage(Message message) {
         final int state = DatabaseManager.getInstance().getWeatherState(message.getFrom().getId(), message.getChatId());
         final String language = DatabaseManager.getInstance().getUserWeatherOptions(message.getFrom().getId())[0];
-        if (message.isGroupMessage() && message.hasText()) {
+        if (!message.isUserMessage() && message.hasText()) {
             if (isCommandForOther(message.getText())) {
                 return null;
             } else if (message.getText().startsWith(Commands.STOPCOMMAND)){
@@ -170,7 +170,7 @@ public class WeatherHandlers implements UpdatesCallback {
 
     private static void sendHideKeyboard(Integer userId, Integer chatId, Integer messageId) {
         SendMessage sendMessage = new SendMessage();
-        sendMessage.setChatId(chatId);
+        sendMessage.setChatId(chatId.toString());
         sendMessage.enableMarkdown(true);
         sendMessage.setReplayToMessageId(messageId);
         sendMessage.setText(Emoji.WAVING_HAND_SIGN.toString());
@@ -231,7 +231,7 @@ public class WeatherHandlers implements UpdatesCallback {
         SendMessage sendMessage = new SendMessage();
         sendMessage.enableMarkdown(true);
         sendMessage.setReplayToMessageId(message.getMessageId());
-        sendMessage.setChatId(message.getChatId());
+        sendMessage.setChatId(message.getChatId().toString());
         sendMessage.setReplayMarkup(getAlertsKeyboard(language));
         sendMessage.setText(LocalisationService.getInstance().getString("alertDeleted", language));
 
@@ -243,7 +243,7 @@ public class WeatherHandlers implements UpdatesCallback {
         SendMessage sendMessage = new SendMessage();
         sendMessage.enableMarkdown(true);
         sendMessage.setReplayToMessageId(message.getMessageId());
-        sendMessage.setChatId(message.getChatId());
+        sendMessage.setChatId(message.getChatId().toString());
         sendMessage.setReplayMarkup(getAlertsKeyboard(language));
         sendMessage.setText(LocalisationService.getInstance().getString("alertsMenuMessage", language));
 
@@ -257,7 +257,7 @@ public class WeatherHandlers implements UpdatesCallback {
             if (message.getText().equals(getCancelCommand(language))) {
                 SendMessage sendMessage = new SendMessage();
                 sendMessage.enableMarkdown(true);
-                sendMessage.setChatId(message.getChatId());
+                sendMessage.setChatId(message.getChatId().toString());
                 sendMessage.setReplayToMessageId(message.getMessageId());
                 sendMessage.setReplayMarkup(getAlertsKeyboard(language));
                 sendMessage.setText(LocalisationService.getInstance().getString("alertsMenuMessage", language));
@@ -280,7 +280,7 @@ public class WeatherHandlers implements UpdatesCallback {
             sendMessageRequest.setReplayMarkup(getAlertsKeyboard(language));
             sendMessageRequest.setReplayToMessageId(message.getMessageId());
             sendMessageRequest.setText(getChooseNewAlertSetMessage(message.getText(), language));
-            sendMessageRequest.setChatId(message.getChatId());
+            sendMessageRequest.setChatId(message.getChatId().toString());
 
             DatabaseManager.getInstance().insertWeatherState(userId, message.getChatId(), ALERT);
             return sendMessageRequest;
@@ -316,7 +316,7 @@ public class WeatherHandlers implements UpdatesCallback {
         ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language);
         sendMessage.setReplayMarkup(replyKeyboardMarkup);
         sendMessage.setReplayToMessageId(message.getMessageId());
-        sendMessage.setChatId(message.getChatId());
+        sendMessage.setChatId(message.getChatId().toString());
         sendMessage.setText(getSettingsMessage(language));
 
         DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), SETTINGS);
@@ -327,7 +327,7 @@ public class WeatherHandlers implements UpdatesCallback {
         SendMessage sendMessage = new SendMessage();
         sendMessage.enableMarkdown(true);
 
-        sendMessage.setChatId(message.getChatId());
+        sendMessage.setChatId(message.getChatId().toString());
         sendMessage.setReplayToMessageId(message.getMessageId());
         sendMessage.setReplayMarkup(getAlertsKeyboard(language));
         sendMessage.setText(getAlertListMessage(message.getFrom().getId(), language));
@@ -340,7 +340,7 @@ public class WeatherHandlers implements UpdatesCallback {
         SendMessage sendMessage = new SendMessage();
         sendMessage.enableMarkdown(true);
 
-        sendMessage.setChatId(message.getChatId());
+        sendMessage.setChatId(message.getChatId().toString());
 
         ReplyKeyboardMarkup replyKeyboardMarkup = getAlertsListKeyboard(message.getFrom().getId(), language);
         if (replyKeyboardMarkup != null) {
@@ -360,7 +360,7 @@ public class WeatherHandlers implements UpdatesCallback {
         SendMessage sendMessage = new SendMessage();
         sendMessage.enableMarkdown(true);
 
-        sendMessage.setChatId(message.getChatId());
+        sendMessage.setChatId(message.getChatId().toString());
         sendMessage.setReplayMarkup(getRecentsKeyboard(message.getFrom().getId(), language, false));
         sendMessage.setText(LocalisationService.getInstance().getString("chooseNewAlertCity", language));
         sendMessage.setReplayToMessageId(message.getMessageId());
@@ -397,7 +397,7 @@ public class WeatherHandlers implements UpdatesCallback {
         sendMessage.enableMarkdown(true);
 
         sendMessage.setReplayToMessageId(message.getMessageId());
-        sendMessage.setChatId(message.getChatId());
+        sendMessage.setChatId(message.getChatId().toString());
         sendMessage.setReplayMarkup(getAlertsKeyboard(language));
         sendMessage.setText(LocalisationService.getInstance().getString("alertsMenuMessage", language));
 
@@ -410,7 +410,7 @@ public class WeatherHandlers implements UpdatesCallback {
         sendMessage.enableMarkdown(true);
 
         sendMessage.setReplayToMessageId(message.getMessageId());
-        sendMessage.setChatId(message.getChatId());
+        sendMessage.setChatId(message.getChatId().toString());
         sendMessage.setReplayMarkup(getUnitsKeyboard(language));
         sendMessage.setText(getUnitsMessage(message.getFrom().getId(), language));
 
@@ -423,7 +423,7 @@ public class WeatherHandlers implements UpdatesCallback {
         sendMessage.enableMarkdown(true);
 
         sendMessage.setReplayToMessageId(message.getMessageId());
-        sendMessage.setChatId(message.getChatId());
+        sendMessage.setChatId(message.getChatId().toString());
         sendMessage.setReplayMarkup(getLanguagesKeyboard(language));
         sendMessage.setText(getLanguageMessage(language));
 
@@ -460,7 +460,7 @@ public class WeatherHandlers implements UpdatesCallback {
         ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language);
         sendMessage.setReplayMarkup(replyKeyboardMarkup);
         sendMessage.setReplayToMessageId(message.getMessageId());
-        sendMessage.setChatId(message.getChatId());
+        sendMessage.setChatId(message.getChatId().toString());
         sendMessage.setText(getSettingsMessage(language));
 
         DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), SETTINGS);
@@ -470,7 +470,7 @@ public class WeatherHandlers implements UpdatesCallback {
     private static BotApiMethod onUnitsError(Integer chatId, Integer messageId, String language) {
         SendMessage sendMessageRequest = new SendMessage();
         sendMessageRequest.enableMarkdown(true);
-        sendMessageRequest.setChatId(chatId);
+        sendMessageRequest.setChatId(chatId.toString());
         sendMessageRequest.setReplayMarkup(getUnitsKeyboard(language));
         sendMessageRequest.setText(LocalisationService.getInstance().getString("errorUnitsNotFound", language));
         sendMessageRequest.setReplayToMessageId(messageId);
@@ -483,7 +483,7 @@ public class WeatherHandlers implements UpdatesCallback {
 
         SendMessage sendMessageRequest = new SendMessage();
         sendMessageRequest.enableMarkdown(true);
-        sendMessageRequest.setChatId(chatId);
+        sendMessageRequest.setChatId(chatId.toString());
         sendMessageRequest.setText(LocalisationService.getInstance().getString("unitsUpdated", language));
         sendMessageRequest.setReplayToMessageId(messageId);
         sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(language));
@@ -518,7 +518,7 @@ public class WeatherHandlers implements UpdatesCallback {
         ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language);
         sendMessage.setReplayMarkup(replyKeyboardMarkup);
         sendMessage.setReplayToMessageId(message.getMessageId());
-        sendMessage.setChatId(message.getChatId());
+        sendMessage.setChatId(message.getChatId().toString());
         sendMessage.setText(getSettingsMessage(language));
 
         DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), SETTINGS);
@@ -528,7 +528,7 @@ public class WeatherHandlers implements UpdatesCallback {
     private static BotApiMethod onLanguageError(Integer chatId, Integer messageId, String language) {
         SendMessage sendMessageRequest = new SendMessage();
         sendMessageRequest.enableMarkdown(true);
-        sendMessageRequest.setChatId(chatId);
+        sendMessageRequest.setChatId(chatId.toString());
         sendMessageRequest.setReplayMarkup(getLanguagesKeyboard(language));
         sendMessageRequest.setText(LocalisationService.getInstance().getString("errorLanguageNotFound", language));
         sendMessageRequest.setReplayToMessageId(messageId);
@@ -542,7 +542,7 @@ public class WeatherHandlers implements UpdatesCallback {
 
         SendMessage sendMessageRequest = new SendMessage();
         sendMessageRequest.enableMarkdown(true);
-        sendMessageRequest.setChatId(chatId);
+        sendMessageRequest.setChatId(chatId.toString());
         sendMessageRequest.setText(LocalisationService.getInstance().getString("languageUpdated", languageCode));
         sendMessageRequest.setReplayToMessageId(messageId);
         sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(languageCode));
@@ -607,7 +607,7 @@ public class WeatherHandlers implements UpdatesCallback {
             sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(language));
             sendMessageRequest.setReplayToMessageId(messageId);
             sendMessageRequest.setText(weather);
-            sendMessageRequest.setChatId(chatId);
+            sendMessageRequest.setChatId(chatId.toString());
 
             DatabaseManager.getInstance().insertWeatherState(userId, chatId, MAINMENU);
             return sendMessageRequest;
@@ -621,7 +621,7 @@ public class WeatherHandlers implements UpdatesCallback {
 
         SendMessage sendMessage = new SendMessage();
         sendMessage.enableMarkdown(true);
-        sendMessage.setChatId(chatId);
+        sendMessage.setChatId(chatId.toString());
         sendMessage.setReplayToMessageId(messageId);
         sendMessage.setReplayMarkup(forceReplyKeyboard);
         sendMessage.setText(LocalisationService.getInstance().getString("onWeatherLocationCommand", language));
@@ -635,7 +635,7 @@ public class WeatherHandlers implements UpdatesCallback {
 
         SendMessage sendMessage = new SendMessage();
         sendMessage.enableMarkdown(true);
-        sendMessage.setChatId(chatId);
+        sendMessage.setChatId(chatId.toString());
         sendMessage.setReplayToMessageId(messageId);
         sendMessage.setReplayMarkup(forceReplyKeyboard);
         sendMessage.setText(LocalisationService.getInstance().getString("onWeatherNewCommand", language));
@@ -709,7 +709,7 @@ public class WeatherHandlers implements UpdatesCallback {
             sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(language));
             sendMessageRequest.setReplayToMessageId(messageId);
             sendMessageRequest.setText(weather);
-            sendMessageRequest.setChatId(chatId);
+            sendMessageRequest.setChatId(chatId.toString());
             DatabaseManager.getInstance().insertWeatherState(userId, chatId, MAINMENU);
             return sendMessageRequest;
         } else {
@@ -722,7 +722,7 @@ public class WeatherHandlers implements UpdatesCallback {
 
         SendMessage sendMessage = new SendMessage();
         sendMessage.enableMarkdown(true);
-        sendMessage.setChatId(chatId);
+        sendMessage.setChatId(chatId.toString());
         sendMessage.setReplayToMessageId(messageId);
         sendMessage.setReplayMarkup(forceReplyKeyboard);
         sendMessage.setText(LocalisationService.getInstance().getString("onWeatherLocationCommand", language));
@@ -736,7 +736,7 @@ public class WeatherHandlers implements UpdatesCallback {
 
         SendMessage sendMessage = new SendMessage();
         sendMessage.enableMarkdown(true);
-        sendMessage.setChatId(chatId);
+        sendMessage.setChatId(chatId.toString());
         sendMessage.setReplayToMessageId(messageId);
         sendMessage.setReplayMarkup(forceReplyKeyboard);
         sendMessage.setText(LocalisationService.getInstance().getString("onWeatherNewCommand", language));
@@ -767,7 +767,7 @@ public class WeatherHandlers implements UpdatesCallback {
             } else if (message.getText().equals(getSettingsCommand(language))) {
                 botApiMethod = onSettingsChoosen(message, language);
             } else if (message.getText().equals(getRateCommand(language))) {
-                botApiMethod = sendRateMessage(message.getChatId(), message.getMessageId(), null, language);
+                botApiMethod = sendRateMessage(message.getChatId().toString(), message.getMessageId(), null, language);
             } else {
                 botApiMethod = sendChooseOptionMessage(message.getChatId(), message.getMessageId(),
                         getMainMenuKeyboard(language), language);
@@ -787,7 +787,7 @@ public class WeatherHandlers implements UpdatesCallback {
         ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language);
         sendMessage.setReplayMarkup(replyKeyboardMarkup);
         sendMessage.setReplayToMessageId(message.getMessageId());
-        sendMessage.setChatId(message.getChatId());
+        sendMessage.setChatId(message.getChatId().toString());
         sendMessage.setText(getSettingsMessage(language));
 
         DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), SETTINGS);
@@ -801,7 +801,7 @@ public class WeatherHandlers implements UpdatesCallback {
         ReplyKeyboardMarkup replyKeyboardMarkup = getRecentsKeyboard(message.getFrom().getId(), language);
         sendMessage.setReplayMarkup(replyKeyboardMarkup);
         sendMessage.setReplayToMessageId(message.getMessageId());
-        sendMessage.setChatId(message.getChatId());
+        sendMessage.setChatId(message.getChatId().toString());
         if (replyKeyboardMarkup.getKeyboard().size() > 3) {
             sendMessage.setText(LocalisationService.getInstance().getString("onForecastCommandFromHistory", language));
         } else {
@@ -819,7 +819,7 @@ public class WeatherHandlers implements UpdatesCallback {
         ReplyKeyboardMarkup replyKeyboardMarkup = getRecentsKeyboard(message.getFrom().getId(), language);
         sendMessage.setReplayMarkup(replyKeyboardMarkup);
         sendMessage.setReplayToMessageId(message.getMessageId());
-        sendMessage.setChatId(message.getChatId());
+        sendMessage.setChatId(message.getChatId().toString());
         if (replyKeyboardMarkup.getKeyboard().size() > 3) {
             sendMessage.setText(LocalisationService.getInstance().getString("onCurrentCommandFromHistory", language));
         } else {
@@ -1136,14 +1136,14 @@ public class WeatherHandlers implements UpdatesCallback {
     private static BotApiMethod sendMessageDefault(Message message, String language) {
         ReplyKeyboardMarkup replyKeyboardMarkup = getMainMenuKeyboard(language);
         DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), MAINMENU);
-        return sendHelpMessage(message.getChatId(), message.getMessageId(), replyKeyboardMarkup, language);
+        return sendHelpMessage(message.getChatId().toString(), message.getMessageId(), replyKeyboardMarkup, language);
     }
 
     private static BotApiMethod sendChooseOptionMessage(Integer chatId, Integer messageId,
                                                 ReplyKeyboard replyKeyboard, String language) {
         SendMessage sendMessage = new SendMessage();
         sendMessage.enableMarkdown(true);
-        sendMessage.setChatId(chatId);
+        sendMessage.setChatId(chatId.toString());
         sendMessage.setReplayToMessageId(messageId);
         sendMessage.setReplayMarkup(replyKeyboard);
         sendMessage.setText(LocalisationService.getInstance().getString("chooseOption", language));
@@ -1151,7 +1151,7 @@ public class WeatherHandlers implements UpdatesCallback {
         return sendMessage;
     }
 
-    private static BotApiMethod sendHelpMessage(Integer chatId, Integer messageId, ReplyKeyboardMarkup replyKeyboardMarkup, String language) {
+    private static BotApiMethod sendHelpMessage(String chatId, Integer messageId, ReplyKeyboardMarkup replyKeyboardMarkup, String language) {
         SendMessage sendMessage = new SendMessage();
         sendMessage.enableMarkdown(true);
         sendMessage.setChatId(chatId);
@@ -1163,7 +1163,7 @@ public class WeatherHandlers implements UpdatesCallback {
         return sendMessage;
     }
 
-    private static BotApiMethod sendRateMessage(Integer chatId, Integer messageId, ReplyKeyboardMarkup replyKeyboardMarkup, String language) {
+    private static BotApiMethod sendRateMessage(String chatId, Integer messageId, ReplyKeyboardMarkup replyKeyboardMarkup, String language) {
         SendMessage sendMessage = new SendMessage();
         sendMessage.enableMarkdown(true);
         sendMessage.setChatId(chatId);
@@ -1189,7 +1189,7 @@ public class WeatherHandlers implements UpdatesCallback {
         sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(language));
         sendMessageRequest.setReplayToMessageId(message.getMessageId());
         sendMessageRequest.setText(weather);
-        sendMessageRequest.setChatId(message.getChatId());
+        sendMessageRequest.setChatId(message.getChatId().toString());
 
         DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), MAINMENU);
         return sendMessageRequest;
@@ -1203,7 +1203,7 @@ public class WeatherHandlers implements UpdatesCallback {
         sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(language));
         sendMessageRequest.setReplayToMessageId(messageId);
         sendMessageRequest.setText(weather);
-        sendMessageRequest.setChatId(chatId);
+        sendMessageRequest.setChatId(chatId.toString());
 
         DatabaseManager.getInstance().insertWeatherState(userId, chatId, MAINMENU);
         return sendMessageRequest;
@@ -1218,7 +1218,7 @@ public class WeatherHandlers implements UpdatesCallback {
         sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(language));
         sendMessageRequest.setReplayToMessageId(message.getMessageId());
         sendMessageRequest.setText(weather);
-        sendMessageRequest.setChatId(message.getChatId());
+        sendMessageRequest.setChatId(message.getChatId().toString());
 
         DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), MAINMENU);
         return sendMessageRequest;
@@ -1232,7 +1232,7 @@ public class WeatherHandlers implements UpdatesCallback {
         sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(language));
         sendMessageRequest.setReplayToMessageId(messageId);
         sendMessageRequest.setText(weather);
-        sendMessageRequest.setChatId(chatId);
+        sendMessageRequest.setChatId(chatId.toString());
 
         DatabaseManager.getInstance().insertWeatherState(userId, chatId, MAINMENU);
         return sendMessageRequest;

From 3695afe337b3910db4531b67207d0928d9303835 Mon Sep 17 00:00:00 2001
From: Rubenlagu <rberlopez@gmail.com>
Date: Wed, 14 Oct 2015 22:39:00 +0200
Subject: [PATCH 02/10] 1. Example of bot for channels

---
 .idea/dataSources.xml                         |   1 +
 .idea/workspace.xml                           | 599 ++++++++----------
 src/main/java/org/telegram/BotConfig.java     |  10 +-
 src/main/java/org/telegram/Main.java          |   1 +
 src/main/java/org/telegram/SenderHelper.java  |  41 +-
 .../org/telegram/api/objects/Message.java     |   2 +-
 .../org/telegram/database/ConectionDB.java    |   8 +-
 .../telegram/database/DatabaseManager.java    |   7 +-
 .../java/org/telegram/services/BotLogger.java | 378 +++++------
 .../telegram/services/DirectionsService.java  |   4 +-
 .../org/telegram/services/TimerExecutor.java  |  10 +-
 .../telegram/services/TransifexService.java   |  32 +-
 .../org/telegram/services/WeatherService.java |  26 +-
 .../updateshandlers/ChannelHandlers.java      | 183 ++++++
 .../updateshandlers/DirectionsHandlers.java   |  17 +-
 .../updateshandlers/FilesHandlers.java        |  31 +-
 .../updateshandlers/TransifexHandlers.java    |  12 +-
 .../updateshandlers/WeatherHandlers.java      |  22 +-
 .../updatesreceivers/UpdatesThread.java       |  16 +-
 .../telegram/updatesreceivers/Webhook.java    |   6 +-
 20 files changed, 748 insertions(+), 658 deletions(-)
 create mode 100644 src/main/java/org/telegram/updateshandlers/ChannelHandlers.java

diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index f8ce7d9..47e81db 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -13,6 +13,7 @@
         <property name="characterSetResults" value="utf8" />
         <property name="yearIsDateType" value="false" />
       </driver-properties>
+      <libraries />
     </data-source>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4e50f1c..fd488de 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,26 +2,25 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="cc3252dd-ba1f-404e-b603-ef880b5c3341" name="Default" comment="1. Webhooks&#10;">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/services/BotLogger.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/services/BotLogger.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Chat.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Chat.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/database/ConectionDB.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/database/ConectionDB.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/services/DirectionsService.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/services/DirectionsService.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/ForwardMessage.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/ForwardMessage.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendAudio.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendAudio.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendChatAction.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendChatAction.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendDocument.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendDocument.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendLocation.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendLocation.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendMessage.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendMessage.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendPhoto.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendPhoto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendSticker.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendSticker.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVideo.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVideo.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVoice.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVoice.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/services/TimerExecutor.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/services/TimerExecutor.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/services/TransifexService.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/services/TransifexService.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/services/WeatherService.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/services/WeatherService.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dataSources.xml" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
@@ -67,69 +66,55 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="WeatherHandlers.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java">
+      <file leaf-file-name="BuildVars.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.21333334">
-              <caret line="123" column="72" selection-start-line="123" selection-start-column="72" selection-end-line="123" selection-end-column="72" />
-              <folding>
-                <element signature="method#getSettingsMessage#0;class#WeatherHandlers#0" expanded="false" />
-                <element signature="method#getHelpMessage#0;class#WeatherHandlers#0" expanded="false" />
-                <element signature="method#getLanguageMessage#0;class#WeatherHandlers#0" expanded="false" />
-                <element signature="method#getUnitsMessage#0;class#WeatherHandlers#0" expanded="false" />
-                <element signature="method#getChooseNewAlertSetMessage#0;class#WeatherHandlers#0" expanded="false" />
-                <element signature="method#getMainMenuKeyboard#0;class#WeatherHandlers#0" expanded="false" />
-                <element signature="method#getLanguagesKeyboard#0;class#WeatherHandlers#0" expanded="false" />
-                <element signature="method#getUnitsKeyboard#0;class#WeatherHandlers#0" expanded="false" />
-                <element signature="method#getSettingsKeyboard#0;class#WeatherHandlers#0" expanded="false" />
-                <element signature="method#getRecentsKeyboard#0;class#WeatherHandlers#0" expanded="false" />
-                <element signature="method#getRecentsKeyboard#1;class#WeatherHandlers#0" expanded="false" />
-                <element signature="method#getAlertsKeyboard#0;class#WeatherHandlers#0" expanded="false" />
-                <element signature="method#getAlertsListKeyboard#0;class#WeatherHandlers#0" expanded="false" />
-                <element signature="method#getForceReply#0;class#WeatherHandlers#0" expanded="false" />
-              </folding>
+            <state vertical-scroll-proportion="0.0">
+              <caret line="10" column="29" selection-start-line="10" selection-start-column="29" selection-end-line="10" selection-end-column="29" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="DirectionsHandlers.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java">
+      <file leaf-file-name="BotConfig.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="211" column="67" selection-start-line="211" selection-start-column="67" selection-end-line="211" selection-end-column="67" />
+              <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="FilesHandlers.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java">
+      <file leaf-file-name="CustomTimerTask.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/CustomTimerTask.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="237" column="67" selection-start-line="237" selection-start-column="67" selection-end-line="237" selection-end-column="67" />
+              <caret line="8" column="22" selection-start-line="8" selection-start-column="22" selection-end-line="8" selection-end-column="22" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TransifexHandlers.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java">
+      <file leaf-file-name="ChannelHandlers.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="93" column="75" selection-start-line="93" selection-start-column="75" selection-end-line="93" selection-end-column="75" />
+            <state vertical-scroll-proportion="-9.296296">
+              <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="SendMessage.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendMessage.java">
+      <file leaf-file-name="Message.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="147" column="45" selection-start-line="147" selection-start-column="45" selection-end-line="147" selection-end-column="45" />
+              <caret line="233" column="0" selection-start-line="233" selection-start-column="0" selection-end-line="233" selection-end-column="0" />
               <folding>
-                <element signature="e#1831#1832#0" expanded="true" />
-                <element signature="e#1867#1868#0" expanded="true" />
+                <element signature="e#8853#8854#0" expanded="true" />
+                <element signature="e#8888#8889#0" expanded="true" />
+                <element signature="e#9500#9501#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -139,50 +124,19 @@
         <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="259" column="0" selection-start-line="259" selection-start-column="0" selection-end-line="259" selection-end-column="0" />
+              <caret line="265" column="82" selection-start-line="265" selection-start-column="82" selection-end-line="265" selection-end-column="82" />
               <folding>
                 <element signature="docComment;class#SenderHelper#0" expanded="false" />
-                <element signature="method#SendApiMethodAsync#0;class#SenderHelper#0" expanded="false" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="BuildVars.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="10" column="50" selection-start-line="10" selection-start-column="50" selection-end-line="10" selection-end-column="50" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="Main.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/Main.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="32" column="44" selection-start-line="32" selection-start-column="44" selection-end-line="32" selection-end-column="44" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="BotConfig.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="15" column="96" selection-start-line="15" selection-start-column="96" selection-end-line="15" selection-end-column="96" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Webhook.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="35" column="25" selection-start-line="35" selection-start-column="25" selection-end-line="35" selection-end-column="25" />
+            <state vertical-scroll-proportion="0.64">
+              <caret line="36" column="8" selection-start-line="36" selection-start-column="8" selection-end-line="36" selection-end-column="8" />
               <folding />
             </state>
           </provider>
@@ -223,16 +177,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/Document.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/ForceReplyKeyboard.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/PhotoSize.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/ReplyKeyboardHide.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/ReplyKeyboardMarkup.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/Sticker.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/Update.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/User.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/UserProfilePhotos.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/Video.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/Voice.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/methods/GetUpdates.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/methods/SetWebhook.java" />
@@ -252,11 +196,8 @@
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/RestApi.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/File.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetFile.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Chat.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java" />
         <option value="/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/Integer.java" />
         <option value="/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/Number.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendDocument.java" />
@@ -268,12 +209,25 @@
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendSticker.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVideo.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVoice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendMessage.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/services/TimerExecutor.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/services/DirectionsService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/services/TransifexService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/database/ConectionDB.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/services/WeatherService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/services/BotLogger.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" />
       </list>
     </option>
   </component>
@@ -463,8 +417,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scope" />
-      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -639,81 +591,15 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="api" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="objects" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="BotAPi" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="BotAPi" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="telegram" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="api" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="methods" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="BotAPi" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="BotAPi" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="telegram" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="api" />
+              <option name="myItemId" value="services" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
       <pane id="PackagesPane" />
+      <pane id="Scope" />
+      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -770,11 +656,11 @@
       <recent name="org.telegram" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="org.telegram.updateshandlers" />
       <recent name="org.telegram.api.objects" />
       <recent name="org.telegram.api.methods" />
       <recent name="org.telegram.methods" />
       <recent name="org.telegram.api" />
-      <recent name="org.telegram.updateshandlers" />
     </key>
   </component>
   <component name="RunManager" selected="Application.Main">
@@ -1216,7 +1102,8 @@
       <workItem from="1444255115907" duration="212000" />
       <workItem from="1444323303608" duration="5644000" />
       <workItem from="1444501308862" duration="423000" />
-      <workItem from="1444843707388" duration="1293000" />
+      <workItem from="1444843707388" duration="1497000" />
+      <workItem from="1444850319963" duration="4636000" />
     </task>
     <task id="LOCAL-00001" summary="First Commit:&#10;1. Transifex bot&#10;2. Weather bot">
       <created>1434854005227</created>
@@ -1500,11 +1387,17 @@
       <option name="project" value="LOCAL" />
       <updated>1441719275787</updated>
     </task>
-    <option name="localTasksCounter" value="48" />
+    <task id="LOCAL-00048" summary="1. Support for channels&#10;">
+      <created>1444845084283</created>
+      <option name="number" value="00048" />
+      <option name="project" value="LOCAL" />
+      <updated>1444845084283</updated>
+    </task>
+    <option name="localTasksCounter" value="49" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="255805000" />
+    <option name="totallyTimeSpent" value="260645000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1593,7 +1486,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="1. Support for webhooks" />
     <MESSAGE value="1. Fix JSON deserialization" />
     <MESSAGE value="1. Fix webhooks, they only allow port 443" />
     <MESSAGE value="1. Fixed loggin levels" />
@@ -1618,7 +1510,8 @@
     <MESSAGE value="1. Some api updates&#10;" />
     <MESSAGE value="1. Certificate&#10;" />
     <MESSAGE value="1. Webhooks&#10;" />
-    <option name="LAST_COMMIT_MESSAGE" value="1. Webhooks&#10;" />
+    <MESSAGE value="1. Support for channels&#10;" />
+    <option name="LAST_COMMIT_MESSAGE" value="1. Support for channels&#10;" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1643,7 +1536,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java</url>
-          <line>119</line>
+          <line>120</line>
           <properties />
           <option name="timeStamp" value="178" />
         </line-breakpoint>
@@ -1655,15 +1548,21 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java</url>
-          <line>275</line>
+          <line>278</line>
           <properties />
           <option name="timeStamp" value="259" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java</url>
+          <line>136</line>
+          <properties />
+          <option name="timeStamp" value="268" />
+        </line-breakpoint>
       </breakpoints>
       <breakpoints-dialog>
         <breakpoints-dialog />
       </breakpoints-dialog>
-      <option name="time" value="264" />
+      <option name="time" value="269" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -1672,105 +1571,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="84" column="0" selection-start-line="84" selection-start-column="0" selection-end-line="84" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="docComment;class#SenderHelper#0" expanded="false" />
-            <element signature="method#SendApiMethodAsync#0;class#SenderHelper#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Voice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.39751554">
-          <caret line="40" column="45" selection-start-line="40" selection-start-column="45" selection-end-line="40" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ReplyKeyboardHide.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.23065016">
-          <caret line="37" column="30" selection-start-line="37" selection-start-column="30" selection-end-line="37" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ReplyKeyboard.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.25541794">
-          <caret line="11" column="62" selection-start-line="11" selection-start-column="62" selection-end-line="11" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.5.4/jackson-databind-2.5.4.jar!/com/fasterxml/jackson/databind/annotation/JsonDeserialize.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-5.0">
-          <caret line="20" column="18" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.5.4/jackson-databind-2.5.4-sources.jar!/com/fasterxml/jackson/databind/annotation/JsonDeserialize.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.9771987">
-          <caret line="31" column="18" selection-start-line="31" selection-start-column="18" selection-end-line="31" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.5.4/jackson-databind-2.5.4-sources.jar!/com/fasterxml/jackson/databind/JsonSerializable.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.8306189">
-          <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.5.4/jackson-databind-2.5.4-sources.jar!/com/fasterxml/jackson/databind/ObjectMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-15.2443">
-          <caret line="393" column="5" selection-start-line="393" selection-start-column="5" selection-end-line="393" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/localisation/strings.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="63" column="56" selection-start-line="63" selection-start-column="56" selection-end-line="63" selection-end-column="56" />
-        </state>
-      </provider>
-      <provider editor-type-id="ResourceBundle">
-        <state />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Audio.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.14086688">
-          <caret line="17" column="42" selection-start-line="17" selection-start-column="30" selection-end-line="17" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/util/concurrent/CompletableFuture.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33229813">
-          <caret line="2161" column="42" selection-start-line="2161" selection-start-column="42" selection-end-line="2161" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/User.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.59574467">
-          <caret line="49" column="0" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/UserProfilePhotos.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.23466666">
@@ -1832,27 +1632,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41954023">
-          <caret line="192" column="32" selection-start-line="192" selection-start-column="19" selection-end-line="192" selection-end-column="32" />
-          <folding>
-            <element signature="e#8695#8696#0" expanded="false" />
-            <element signature="e#8735#8736#0" expanded="false" />
-            <element signature="e#8776#8777#0" expanded="false" />
-            <element signature="e#8819#8820#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/UpdatesCallback.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7413333">
-          <caret line="22" column="29" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="29" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/Number.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.33333334">
@@ -1879,7 +1658,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="2.24">
           <caret line="79" column="38" selection-start-line="79" selection-start-column="38" selection-end-line="79" selection-end-column="38" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1911,7 +1689,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.369969">
           <caret line="79" column="45" selection-start-line="79" selection-start-column="45" selection-end-line="79" selection-end-column="45" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1927,7 +1704,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.5789474">
           <caret line="83" column="31" selection-start-line="83" selection-start-column="31" selection-end-line="83" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1967,7 +1743,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="17" column="105" selection-start-line="17" selection-start-column="105" selection-end-line="17" selection-end-column="105" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1979,112 +1754,112 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/SentCallback.java">
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/NoSuchMethodError.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="22" column="81" selection-start-line="22" selection-start-column="81" selection-end-line="22" selection-end-column="81" />
-          <folding />
+        <state vertical-scroll-proportion="0.5340557">
+          <caret line="46" column="11" selection-start-line="46" selection-start-column="11" selection-end-line="46" selection-end-column="11" />
+          <folding>
+            <element signature="e#877#878#0" expanded="false" />
+            <element signature="e#900#901#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/RestApi.java">
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/io/ObjectStreamException.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="31" column="19" selection-start-line="31" selection-start-column="19" selection-end-line="31" selection-end-column="19" />
+        <state vertical-scroll-proportion="0.23219815">
+          <caret line="33" column="22" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java">
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/io/InvalidObjectException.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="84" column="0" selection-start-line="84" selection-start-column="0" selection-end-line="84" selection-end-column="0" />
-          <folding />
+        <state vertical-scroll-proportion="0.32507738">
+          <caret line="37" column="49" selection-start-line="37" selection-start-column="49" selection-end-line="37" selection-end-column="49" />
+          <folding>
+            <element signature="e#857#858#0" expanded="false" />
+            <element signature="e#886#887#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendMessage.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="35" column="25" selection-start-line="35" selection-start-column="25" selection-end-line="35" selection-end-column="25" />
+        <state vertical-scroll-proportion="-2.1114552">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="15" column="96" selection-start-line="15" selection-start-column="96" selection-end-line="15" selection-end-column="96" />
+        <state vertical-scroll-proportion="0.071207434">
+          <caret line="28" column="62" selection-start-line="28" selection-start-column="62" selection-end-line="28" selection-end-column="62" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="10" column="50" selection-start-line="10" selection-start-column="50" selection-end-line="10" selection-end-column="50" />
+        <state vertical-scroll-proportion="0.25541794">
+          <caret line="35" column="57" selection-start-line="35" selection-start-column="57" selection-end-line="35" selection-end-column="57" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="211" column="67" selection-start-line="211" selection-start-column="67" selection-end-line="211" selection-end-column="67" />
+        <state vertical-scroll-proportion="0.25541794">
+          <caret line="24" column="61" selection-start-line="24" selection-start-column="61" selection-end-line="24" selection-end-column="61" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/SentCallback.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="237" column="67" selection-start-line="237" selection-start-column="67" selection-end-line="237" selection-end-column="67" />
+        <state vertical-scroll-proportion="0.4876161">
+          <caret line="22" column="81" selection-start-line="22" selection-start-column="81" selection-end-line="22" selection-end-column="81" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/UpdatesCallback.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="93" column="75" selection-start-line="93" selection-start-column="75" selection-end-line="93" selection-end-column="75" />
+        <state vertical-scroll-proportion="0.4876161">
+          <caret line="22" column="29" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="29" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/Main.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="32" column="44" selection-start-line="32" selection-start-column="44" selection-end-line="32" selection-end-column="44" />
+        <state vertical-scroll-proportion="0.44272447">
+          <caret line="58" column="39" selection-start-line="58" selection-start-column="39" selection-end-line="58" selection-end-column="39" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="259" column="0" selection-start-line="259" selection-start-column="0" selection-end-line="259" selection-end-column="0" />
-          <folding>
-            <element signature="docComment;class#SenderHelper#0" expanded="false" />
-            <element signature="method#SendApiMethodAsync#0;class#SenderHelper#0" expanded="false" />
-          </folding>
+        <state vertical-scroll-proportion="2.6702785">
+          <caret line="138" column="36" selection-start-line="138" selection-start-column="36" selection-end-line="138" selection-end-column="36" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendMessage.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/RestApi.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="147" column="45" selection-start-line="147" selection-start-column="45" selection-end-line="147" selection-end-column="45" />
-          <folding>
-            <element signature="e#1831#1832#0" expanded="true" />
-            <element signature="e#1867#1868#0" expanded="true" />
-          </folding>
+        <state vertical-scroll-proportion="0.37306502">
+          <caret line="31" column="19" selection-start-line="31" selection-start-column="19" selection-end-line="31" selection-end-column="19" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.21333334">
-          <caret line="123" column="72" selection-start-line="123" selection-start-column="72" selection-end-line="123" selection-end-column="72" />
+        <state vertical-scroll-proportion="24.705883">
+          <caret line="1258" column="38" selection-start-line="1258" selection-start-column="38" selection-end-line="1258" selection-end-column="38" />
           <folding>
             <element signature="method#getSettingsMessage#0;class#WeatherHandlers#0" expanded="false" />
             <element signature="method#getHelpMessage#0;class#WeatherHandlers#0" expanded="false" />
@@ -2104,6 +1879,136 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/TimerExecutor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6453901">
+          <caret line="104" column="29" selection-start-line="104" selection-start-column="29" selection-end-line="104" selection-end-column="29" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/Commands.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.28368795">
+          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/DirectionsService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-0.56028366">
+          <caret line="100" column="27" selection-start-line="100" selection-start-column="27" selection-end-line="100" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/TransifexService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="7.6950355">
+          <caret line="227" column="39" selection-start-line="227" selection-start-column="39" selection-end-line="227" selection-end-column="39" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/database/ConectionDB.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.47517732">
+          <caret line="83" column="36" selection-start-line="83" selection-start-column="36" selection-end-line="83" selection-end-column="36" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/WeatherService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-4.070922">
+          <caret line="264" column="36" selection-start-line="264" selection-start-column="36" selection-end-line="264" selection-end-column="36" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.61702126">
+          <caret line="91" column="36" selection-start-line="91" selection-start-column="36" selection-end-line="91" selection-end-column="36" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/BotLogger.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48">
+          <caret line="39" column="34" selection-start-line="39" selection-start-column="34" selection-end-line="39" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#11493#11494#0" expanded="true" />
+            <element signature="e#11559#11560#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/CustomTimerTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="8" column="22" selection-start-line="8" selection-start-column="22" selection-end-line="8" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="233" column="0" selection-start-line="233" selection-start-column="0" selection-end-line="233" selection-end-column="0" />
+          <folding>
+            <element signature="e#8853#8854#0" expanded="true" />
+            <element signature="e#8888#8889#0" expanded="true" />
+            <element signature="e#9500#9501#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="265" column="82" selection-start-line="265" selection-start-column="82" selection-end-line="265" selection-end-column="82" />
+          <folding>
+            <element signature="docComment;class#SenderHelper#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-9.296296">
+          <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="10" column="29" selection-start-line="10" selection-start-column="29" selection-end-line="10" selection-end-column="29" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/Main.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.64">
+          <caret line="36" column="8" selection-start-line="36" selection-start-column="8" selection-end-line="36" selection-end-column="8" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/org/telegram/BotConfig.java b/src/main/java/org/telegram/BotConfig.java
index 7c0e841..70e1a83 100644
--- a/src/main/java/org/telegram/BotConfig.java
+++ b/src/main/java/org/telegram/BotConfig.java
@@ -7,12 +7,14 @@ package org.telegram;
  * @date 20 of June of 2015
  */
 public class BotConfig {
-    public static final String TOKENWEATHER = "<bot-token>";
+    public static final String TOKENWEATHER = "<token>";
     public static final String USERNAMEWEATHER = "weatherbot";
-    public static final String TOKENTRANSIFEX = "<bot-token>";
+    public static final String TOKENTRANSIFEX = "<token>";
     public static final String USERNAMETRANSIFEX = "TGlanguagesbot";
-    public static final String TOKENFILES = "<bot-token>";
+    public static final String TOKENFILES = "<token>";
     public static final String USERNAMEFILES = "filesbot";
-    public static final String TOKENDIRECTIONS = "<bot-token>";
+    public static final String TOKENDIRECTIONS = "<token>";
     public static final String USERNAMEDIRECTIONS = "directionsbot";
+    public static final String TOKENCHANNEL = "<token>";
+    public static final String USERNAMECHANNEL = "channelupdatesbot";
 }
diff --git a/src/main/java/org/telegram/Main.java b/src/main/java/org/telegram/Main.java
index a765cc3..d02e043 100644
--- a/src/main/java/org/telegram/Main.java
+++ b/src/main/java/org/telegram/Main.java
@@ -31,6 +31,7 @@ public class Main {
 
     private static void initBots() {
         UpdatesCallback weatherBot = new WeatherHandlers(webhook);
+        UpdatesCallback channelBot = new ChannelHandlers(webhook);
         UpdatesCallback transifexBot = new TransifexHandlers(webhook);
         UpdatesCallback filesBot = new FilesHandlers(webhook);
         UpdatesCallback directionsBot = new DirectionsHandlers(webhook);
diff --git a/src/main/java/org/telegram/SenderHelper.java b/src/main/java/org/telegram/SenderHelper.java
index 2562612..f65eb8b 100644
--- a/src/main/java/org/telegram/SenderHelper.java
+++ b/src/main/java/org/telegram/SenderHelper.java
@@ -38,7 +38,7 @@ import java.util.concurrent.Executors;
  * @date 20 of June of 2015
  */
 public class SenderHelper {
-    private static volatile BotLogger log = BotLogger.getLogger(SenderHelper.class.getName());
+    private static final  String LOGTAG = "SENDERHELPER";
     private static final ExecutorService exe = Executors.newSingleThreadExecutor();
 
     public static void SendDocument(SendDocument sendDocument, String botToken) {
@@ -77,12 +77,13 @@ public class SenderHelper {
             }
 
             CloseableHttpResponse response = httpClient.execute(httppost);
+        } catch (IOException e) {
+            BotLogger.error(LOGTAG, e);
+        } finally {
             if (sendDocument.isNewDocument()) {
                 File fileToDelete = new File(sendDocument.getDocument());
                 fileToDelete.delete();
             }
-        } catch (IOException e) {
-            log.error(e);
         }
     }
 
@@ -125,7 +126,7 @@ public class SenderHelper {
 
             CloseableHttpResponse response = httpClient.execute(httppost);
         } catch (IOException e) {
-            log.error(e);
+            BotLogger.error(LOGTAG, e);
         }
     }
 
@@ -174,7 +175,7 @@ public class SenderHelper {
 
             CloseableHttpResponse response = httpClient.execute(httppost);
         } catch (IOException e) {
-            log.error(e);
+            BotLogger.error(LOGTAG, e);
         }
     }
 
@@ -210,14 +211,14 @@ public class SenderHelper {
             }
 
             CloseableHttpResponse response = httpClient.execute(httppost);
+        } catch (IOException e) {
+            BotLogger.error(LOGTAG, e);
+        } finally {
             if (sendSticker.isNewSticker()) {
                 File fileToDelete = new File(sendSticker.getSticker());
                 fileToDelete.delete();
             }
-        } catch (IOException e) {
-            log.error(e);
         }
-
     }
 
     public static void SendWebhook(String webHookURL, String botToken) {
@@ -237,14 +238,15 @@ public class SenderHelper {
             HttpEntity ht = response.getEntity();
             BufferedHttpEntity buf = new BufferedHttpEntity(ht);
             String responseContent = EntityUtils.toString(buf, "UTF-8");
-            log.debug(responseContent);
+            BotLogger.debug(LOGTAG, responseContent);
         } catch (IOException e) {
-            log.error(e);
+            BotLogger.error(LOGTAG, e);
         }
 
     }
 
-    public static void SendApiMethod(BotApiMethod method, String botToken) {
+    public static void SendApiMethod(BotApiMethod method, String botToken) throws InvalidObjectException {
+        String responseContent = "{}";
         try {
             CloseableHttpClient httpclient = HttpClientBuilder.create().setSSLHostnameVerifier(new NoopHostnameVerifier()).build();
             String url = Constants.BASEURL + botToken + "/" + method.getPath();
@@ -254,15 +256,16 @@ public class SenderHelper {
             CloseableHttpResponse response = httpclient.execute(httppost);
             HttpEntity ht = response.getEntity();
             BufferedHttpEntity buf = new BufferedHttpEntity(ht);
-            String responseContent = EntityUtils.toString(buf, "UTF-8");
-
-            JSONObject jsonObject = new JSONObject(responseContent);
-            if (!jsonObject.getBoolean("ok")) {
-                throw new InvalidObjectException(jsonObject.toString());
-            }
+            responseContent = EntityUtils.toString(buf, "UTF-8");
         } catch (IOException e) {
-            log.error(e);
+            BotLogger.error(LOGTAG, e);
         }
+
+        JSONObject jsonObject = new JSONObject(responseContent);
+        if (!jsonObject.getBoolean("ok")) {
+            throw new InvalidObjectException(jsonObject.getString("description"));
+        }
+
     }
 
     public static void SendApiMethodAsync(BotApiMethod method, String botToken, SentCallback callback) {
@@ -284,7 +287,7 @@ public class SenderHelper {
                 }
                 callback.onResult(method, jsonObject);
             } catch (IOException e) {
-                log.error(e);
+                BotLogger.error(LOGTAG, e);
             }
         });
     }
diff --git a/src/main/java/org/telegram/api/objects/Message.java b/src/main/java/org/telegram/api/objects/Message.java
index 9ada2d3..7702c95 100644
--- a/src/main/java/org/telegram/api/objects/Message.java
+++ b/src/main/java/org/telegram/api/objects/Message.java
@@ -227,7 +227,7 @@ public class Message implements BotApiObject {
     }
 
     public boolean hasText() {
-        return text != null;
+        return text != null && !text.isEmpty();
     }
 
     public String getText() {
diff --git a/src/main/java/org/telegram/database/ConectionDB.java b/src/main/java/org/telegram/database/ConectionDB.java
index fa75142..5a98513 100644
--- a/src/main/java/org/telegram/database/ConectionDB.java
+++ b/src/main/java/org/telegram/database/ConectionDB.java
@@ -19,7 +19,7 @@ import java.sql.*;
  * @date 3/12/14
  */
 public class ConectionDB {
-    private static volatile BotLogger log = BotLogger.getLogger(ConectionDB.class.getName());
+    private static final String LOGTAG = "CONNECTIONDB";
     private Connection currentConection;
 
     public ConectionDB() {
@@ -32,7 +32,7 @@ public class ConectionDB {
             Class.forName(BuildVars.controllerDB).newInstance();
             connection = DriverManager.getConnection(BuildVars.linkDB, BuildVars.userDB, BuildVars.password);
         } catch (SQLException | ClassNotFoundException | IllegalAccessException | InstantiationException e) {
-            log.error(e);
+            BotLogger.error(LOGTAG, e);
         }
 
         return connection;
@@ -42,7 +42,7 @@ public class ConectionDB {
         try {
             this.currentConection.close();
         } catch (SQLException e) {
-            log.error(e);
+            BotLogger.error(LOGTAG, e);
         }
 
     }
@@ -81,7 +81,7 @@ public class ConectionDB {
                 }
             }
         } catch (SQLException e) {
-            log.error(e);
+            BotLogger.error(LOGTAG, e);
         }
         return max;
     }
diff --git a/src/main/java/org/telegram/database/DatabaseManager.java b/src/main/java/org/telegram/database/DatabaseManager.java
index fd5b168..295ee25 100644
--- a/src/main/java/org/telegram/database/DatabaseManager.java
+++ b/src/main/java/org/telegram/database/DatabaseManager.java
@@ -26,7 +26,8 @@ import java.util.List;
  * @date 3/12/14
  */
 public class DatabaseManager {
-    private static volatile BotLogger log = BotLogger.getLogger(DatabaseManager.class.getName()); ///< Logger
+    private static final String LOGTAG = "DATABASEMANAGER";
+
     private static volatile DatabaseManager instance;
     private static volatile ConectionDB connetion;
 
@@ -36,7 +37,7 @@ public class DatabaseManager {
     private DatabaseManager() {
         connetion = new ConectionDB();
         final int currentVersion = connetion.checkVersion();
-        log.info("Current db version: " + currentVersion);
+        BotLogger.info(LOGTAG, "Current db version: " + currentVersion);
         if (currentVersion < CreationStrings.version) {
             recreateTable(currentVersion);
         }
@@ -88,7 +89,7 @@ public class DatabaseManager {
             }
             connetion.commitTransaction();
         } catch (SQLException e) {
-            log.error(e);
+            BotLogger.error(LOGTAG, e);
         }
     }
 
diff --git a/src/main/java/org/telegram/services/BotLogger.java b/src/main/java/org/telegram/services/BotLogger.java
index 9568050..03380d0 100644
--- a/src/main/java/org/telegram/services/BotLogger.java
+++ b/src/main/java/org/telegram/services/BotLogger.java
@@ -4,67 +4,44 @@ import org.telegram.BuildVars;
 
 import javax.validation.constraints.NotNull;
 import java.io.*;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.concurrent.ConcurrentHashMap;
+import java.time.LocalDateTime;
 import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.logging.ConsoleHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
  * @author Ruben Bermudez
- * @version 1.0
- * @brief Logger
+ * @version 2.0
+ * @brief Logger to file
  * @date 21/01/15
  */
 public class BotLogger {
-    private volatile Object lockToWrite = new Object();
-
-    private final Logger logger;
+    private static final Object lockToWrite = new Object();
     private static volatile PrintWriter logginFile;
-    private Calendar lastFileDate;
     private static volatile String currentFileName;
+    private static final Logger logger = Logger.getLogger("Tsupport Bot");
+    private static volatile LocalDateTime lastFileDate;
     private static LoggerThread loggerThread = new LoggerThread();
-    private static volatile ConcurrentHashMap<String, BotLogger> instances = new ConcurrentHashMap<>();
-    private final static ConcurrentLinkedQueue<String> logsToFile = new ConcurrentLinkedQueue<>();
+    private static final ConcurrentLinkedQueue<String> logsToFile = new ConcurrentLinkedQueue<>();
 
     static {
-
-        loggerThread.start();
-    }
-
-    public static BotLogger getLogger(@NotNull String className) {
-        if (!instances.containsKey(className)) {
-            synchronized (BotLogger.class) {
-                if (!instances.containsKey(className)) {
-                    BotLogger instance = new BotLogger(className);
-                    instances.put(className, instance);
-                    return instance;
-                } else {
-                    return instances.get(className);
-                }
-            }
-        } else {
-            return instances.get(className);
-        }
-    }
-
-    private BotLogger(String classname) {
-        logger = Logger.getLogger(classname);
         logger.setLevel(Level.ALL);
-        ConsoleHandler handler = new ConsoleHandler();
-        handler.setLevel(Level.ALL);
-        logger.addHandler(handler);
-        lastFileDate = new GregorianCalendar();
-        if  (currentFileName == null || currentFileName.length() == 0) {
-            currentFileName = BuildVars.pathToLogs + dateFormaterForFileName(lastFileDate) + ".log";
+        loggerThread.start();
+        lastFileDate = LocalDateTime.now();
+        if ((currentFileName == null) || (currentFileName.compareTo("") == 0)) {
+            currentFileName = dateFormatterForFileName(lastFileDate) + ".log";
             try {
-                File file = new File(currentFileName);
-                if (!file.exists()) {
-                    file.createNewFile();
+                final File file = new File(currentFileName);
+                if (file.exists()) {
+                    logginFile = new PrintWriter(new BufferedWriter(new FileWriter(currentFileName, true)));
+                } else {
+                    final boolean created = file.createNewFile();
+                    if (created) {
+                        logginFile = new PrintWriter(new BufferedWriter(new FileWriter(currentFileName, true)));
+                    } else {
+                        throw new NullPointerException("File for logging error");
+                    }
                 }
-                logginFile = new PrintWriter(new BufferedWriter(new FileWriter(currentFileName, true)));
             } catch (IOException e) {
                 e.printStackTrace();
             }
@@ -72,271 +49,261 @@ public class BotLogger {
         }
     }
 
-
-    public void log(@NotNull Level level, String msg) {
-        logger.log(level, msg);
-        logToFile(level, msg);
+    public static void log(@NotNull Level level, String tag, String msg) {
+        logger.log(level, String.format("[%s] %s", tag, msg));
+        logToFile(level, tag, msg);
     }
 
 
-    public void severe(String msg) {
-        logger.severe(msg);
-        logToFile(Level.SEVERE, msg);
+    public static void severe(String tag, String msg) {
+        logger.severe(String.format("[%s] %s", tag, msg));
+        logToFile(Level.SEVERE, tag, msg);
     }
 
-    public void warn(String msg) {
-        warning(msg);
+    public static void warn(String tag, String msg) {
+        warning(tag, msg);
     }
 
-    public void debug(String msg) {
-        fine(msg);
+    public static void debug(String tag, String msg) {
+        fine(tag, msg);
     }
 
-    public void error(String msg) {
-        severe(msg);
+    public static void error(String tag, String msg) {
+        severe(tag, msg);
     }
 
-    public void trace(String msg) {
-        finer(msg);
+    public static void trace(String tag, String msg) {
+        finer(tag, msg);
     }
 
-    public void warning(String msg) {
-        logger.warning(msg);
-        logToFile(Level.WARNING, msg);
+    public static void warning(String tag, String msg) {
+        logger.warning(String.format("[%s] %s", tag, msg));
+        logToFile(Level.WARNING, tag, msg);
     }
 
 
-    public void info(String msg) {
-        logger.info(msg);
-        logToFile(Level.INFO, msg);
+    public static void info(String tag, String msg) {
+        logger.info(String.format("[%s] %s", tag, msg));
+        logToFile(Level.INFO, tag, msg);
     }
 
 
-    public void config(String msg) {
-        logger.config(msg);
-        logToFile(Level.CONFIG, msg);
+    public static void config(String tag, String msg) {
+        logger.config(String.format("[%s] %s", tag, msg));
+        logToFile(Level.CONFIG, tag, msg);
     }
 
 
-    public void fine(String msg) {
-        logger.fine(msg);
-        logToFile(Level.FINE, msg);
+    public static void fine(String tag, String msg) {
+        logger.fine(String.format("[%s] %s", tag, msg));
+        logToFile(Level.FINE, tag, msg);
     }
 
 
-    public void finer(String msg) {
-        logger.finer(msg);
-        logToFile(Level.FINER, msg);
+    public static void finer(String tag, String msg) {
+        logger.finer(String.format("[%s] %s", tag, msg));
+        logToFile(Level.FINER, tag, msg);
     }
 
 
-    public void finest(String msg) {
-        logger.finest(msg);
-        logToFile(Level.FINEST, msg);
+    public static void finest(String tag, String msg) {
+        logger.finest(String.format("[%s] %s", tag, msg));
+        logToFile(Level.FINEST, tag, msg);
     }
 
 
-    public void log(@NotNull Level level, @NotNull Throwable throwable) {
-        throwable.printStackTrace();
-        logToFile(level, throwable);
+    public static void log(@NotNull Level level, @NotNull String tag, @NotNull Throwable throwable) {
+        logger.log(level, String.format("[%s] Exception", tag), throwable);
+        logToFile(level, tag, throwable);
     }
 
-    public void log(@NotNull Level level, String msg, Throwable thrown) {
+    public static void log(@NotNull Level level, @NotNull String tag, @NotNull String msg, @NotNull Throwable thrown) {
         logger.log(level, msg, thrown);
-        logToFile(level, msg ,thrown);
+        logToFile(level, msg, thrown);
     }
 
-    public void severe(@NotNull Throwable throwable) {
-        logToFile(Level.SEVERE, throwable);
+    public static void severe(@NotNull String tag, @NotNull Throwable throwable) {
+        logToFile(Level.SEVERE, tag, throwable);
     }
 
-    public void warning(@NotNull Throwable throwable) {
-        logToFile(Level.WARNING, throwable);
+    public static void warning(@NotNull String tag, @NotNull Throwable throwable) {
+        logToFile(Level.WARNING, tag, throwable);
     }
 
-    public void info(@NotNull Throwable throwable) {
-        logToFile(Level.INFO, throwable);
+    public static void info(@NotNull String tag, @NotNull Throwable throwable) {
+        logToFile(Level.INFO, tag, throwable);
     }
 
-    public void config(@NotNull Throwable throwable) {
-        logToFile(Level.CONFIG, throwable);
+    public static void config(@NotNull String tag, @NotNull Throwable throwable) {
+        logToFile(Level.CONFIG, tag, throwable);
     }
 
-    public void fine(@NotNull Throwable throwable) {
-        logToFile(Level.FINE, throwable);
+    public static void fine(@NotNull String tag, @NotNull Throwable throwable) {
+        logToFile(Level.FINE, tag, throwable);
     }
 
-    public void finer(@NotNull Throwable throwable) {
-        logToFile(Level.FINER, throwable);
+    public static void finer(@NotNull String tag, @NotNull Throwable throwable) {
+        logToFile(Level.FINER, tag, throwable);
     }
 
-    public void finest(@NotNull Throwable throwable) {
-        logToFile(Level.FINEST, throwable);
+    public static void finest(@NotNull String tag, @NotNull Throwable throwable) {
+        logToFile(Level.FINEST, tag, throwable);
     }
 
-    public void warn(Throwable throwable) {
-        warning(throwable);
+    public static void warn(@NotNull String tag, Throwable throwable) {
+        warning(tag, throwable);
     }
 
-    public void debug(Throwable throwable) {
-        fine(throwable);
+    public static void debug(@NotNull String tag, Throwable throwable) {
+        fine(tag, throwable);
     }
 
-    public void error(Throwable throwable) {
-        severe(throwable);
+    public static void error(@NotNull String tag, Throwable throwable) {
+        severe(tag, throwable);
     }
 
-    public void trace(Throwable throwable) {
-        finer(throwable);
+    public static void trace(@NotNull String tag, Throwable throwable) {
+        finer(tag, throwable);
     }
 
-    public void severe(String msg, @NotNull Throwable throwable) {
-        log(Level.SEVERE, msg, throwable);
+    public static void severe(@NotNull String msg, @NotNull String tag, @NotNull Throwable throwable) {
+        log(Level.SEVERE, tag, msg, throwable);
     }
 
-    public void warning(String msg, @NotNull Throwable throwable) {
-        log(Level.WARNING, msg, throwable);
+    public static void warning(@NotNull String msg, @NotNull String tag, @NotNull Throwable throwable) {
+        log(Level.WARNING, tag, msg, throwable);
     }
 
-    public void info(String msg, @NotNull Throwable throwable) {
-        log(Level.INFO, msg, throwable);
+    public static void info(@NotNull String msg, @NotNull String tag, @NotNull Throwable throwable) {
+        log(Level.INFO, tag, msg, throwable);
     }
 
-    public void config(String msg, @NotNull Throwable throwable) {
-        log(Level.CONFIG, msg, throwable);
+    public static void config(@NotNull String msg, @NotNull String tag, @NotNull Throwable throwable) {
+        log(Level.CONFIG, tag, msg, throwable);
     }
 
-    public void fine(String msg, @NotNull Throwable throwable) {
-        log(Level.FINE, msg, throwable);
+    public static void fine(@NotNull String msg, @NotNull String tag, @NotNull Throwable throwable) {
+        log(Level.FINE, tag, msg, throwable);
     }
 
-    public void finer(String msg, @NotNull Throwable throwable) {
-        log(Level.FINER, msg, throwable);
+    public static void finer(@NotNull String msg, @NotNull String tag, @NotNull Throwable throwable) {
+        log(Level.FINER, tag, msg, throwable);
     }
 
-    public void finest(String msg, @NotNull Throwable throwable) {
+    public static void finest(@NotNull String msg, @NotNull String tag, @NotNull Throwable throwable) {
         log(Level.FINEST, msg, throwable);
     }
 
-    public void warn(String msg, @NotNull Throwable throwable) {
-        log(Level.WARNING, msg, throwable);
+    public static void warn(@NotNull String msg, @NotNull String tag, @NotNull Throwable throwable) {
+        log(Level.WARNING, tag, msg, throwable);
     }
 
-    public void debug(String msg, @NotNull Throwable throwable) {
-        log(Level.FINE, msg, throwable);
+    public static void debug(@NotNull String msg, @NotNull String tag, @NotNull Throwable throwable) {
+        log(Level.FINE, tag, msg, throwable);
     }
 
-    public void error(String msg, @NotNull Throwable throwable) {
-        log(Level.SEVERE, msg, throwable);
+    public static void error(@NotNull String msg, @NotNull String tag, @NotNull Throwable throwable) {
+        log(Level.SEVERE, tag, msg, throwable);
     }
 
-    public void trace(String msg, @NotNull Throwable throwable) {
-        log(Level.FINER, msg, throwable);
+    public static void trace(@NotNull String msg, @NotNull String tag, @NotNull Throwable throwable) {
+        log(Level.FINER, tag, msg, throwable);
     }
 
-    private boolean isCurrentDate(Calendar calendar) {
-        if (calendar.get(Calendar.DAY_OF_MONTH) != lastFileDate.get(Calendar.DAY_OF_MONTH)) {
-            return false;
-        }
-        if (calendar.get(Calendar.MONTH) != lastFileDate.get(Calendar.MONTH)) {
-            return false;
-        }
-        if (calendar.get(Calendar.YEAR) != lastFileDate.get(Calendar.YEAR)) {
-            return false;
-        }
-        return true;
+    private static boolean isCurrentDate(LocalDateTime dateTime) {
+        return dateTime.toLocalDate().isEqual(lastFileDate.toLocalDate());
     }
 
-    private String dateFormaterForFileName(@NotNull Calendar calendar) {
+    private static String dateFormatterForFileName(@NotNull LocalDateTime dateTime) {
         String dateString = "";
-        dateString += calendar.get(Calendar.DAY_OF_MONTH);
-        dateString += calendar.get(Calendar.MONTH) + 1;
-        dateString += calendar.get(Calendar.YEAR);
+        dateString += dateTime.getDayOfMonth();
+        dateString += dateTime.getMonthValue();
+        dateString += dateTime.getYear();
         return dateString;
     }
 
-    private String dateFormaterForLogs(@NotNull Calendar calendar) {
+    private static String dateFormatterForLogs(@NotNull LocalDateTime dateTime) {
         String dateString = "[";
-        dateString += calendar.get(Calendar.DAY_OF_MONTH) + "_";
-        dateString += (calendar.get(Calendar.MONTH) + 1) + "_";
-        dateString += calendar.get(Calendar.YEAR) + "_";
-        dateString += calendar.get(Calendar.HOUR_OF_DAY) + "_";
-        dateString += calendar.get(Calendar.MINUTE) + ":";
-        dateString += calendar.get(Calendar.SECOND);
+        dateString += dateTime.getDayOfMonth() + "_";
+        dateString += dateTime.getMonthValue() + "_";
+        dateString += dateTime.getYear() + "_";
+        dateString += dateTime.getHour() + ":";
+        dateString += dateTime.getMinute() + ":";
+        dateString += dateTime.getSecond();
         dateString += "] ";
         return dateString;
     }
 
-    private void updateAndCreateFile(Calendar calendar) {
-        if (isCurrentDate(calendar)) {
-            return;
-        }
-        lastFileDate = new GregorianCalendar();
-        currentFileName = BuildVars.pathToLogs + dateFormaterForFileName(lastFileDate) + ".log";
-        try {
-            logginFile.flush();
-            logginFile.close();
-            File file = new File(currentFileName);
-            if (!file.exists()) {
-                file.createNewFile();
+    private static void updateAndCreateFile(LocalDateTime dateTime) {
+        if (!isCurrentDate(dateTime)) {
+            lastFileDate = LocalDateTime.now();
+            currentFileName = BuildVars.pathToLogs + dateFormatterForFileName(lastFileDate) + ".log";
+            try {
+                logginFile.flush();
+                logginFile.close();
+                final File file = new File(currentFileName);
+                if (file.exists()) {
+                    logginFile = new PrintWriter(new BufferedWriter(new FileWriter(currentFileName, true)));
+                } else {
+                    final boolean created = file.createNewFile();
+                    if (created) {
+                        logginFile = new PrintWriter(new BufferedWriter(new FileWriter(currentFileName, true)));
+                    } else {
+                        throw new NullPointerException("Error updating log file");
+                    }
+                }
+            } catch (IOException ignored) {
             }
-            logginFile = new PrintWriter(new BufferedWriter(new FileWriter(currentFileName, true)));
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
         }
     }
 
-    private void logToFile(@NotNull Level level, Throwable throwable) {
-        if (!isLoggable(level)){
-            return;
-        }
-        synchronized (lockToWrite) {
-            Calendar currentDate = new GregorianCalendar();
-            String dateForLog = dateFormaterForLogs(currentDate);
-            updateAndCreateFile(currentDate);
-            logThrowableToFile(level, throwable, dateForLog);
+
+    private static void logToFile(@NotNull Level level, @NotNull String tag, @NotNull Throwable throwable) {
+        if (isLoggable(level)) {
+            synchronized (lockToWrite) {
+                final LocalDateTime currentDate = LocalDateTime.now();
+                final String dateForLog = dateFormatterForLogs(currentDate);
+                updateAndCreateFile(currentDate);
+                logThrowableToFile(level, tag, throwable, dateForLog);
+            }
         }
     }
 
 
 
-    private void logToFile(@NotNull Level level, String msg) {
-        if (!isLoggable(level)){
-            return;
-        }
-        synchronized (lockToWrite) {
-            Calendar currentDate = new GregorianCalendar();
-            updateAndCreateFile(currentDate);
-            String dateForLog = dateFormaterForLogs(currentDate);
-            logMsgToFile(level, msg, dateForLog);
+    private static void logToFile(@NotNull Level level, @NotNull String tag, @NotNull String msg) {
+        if (isLoggable(level)) {
+            synchronized (lockToWrite) {
+                final LocalDateTime currentDate = LocalDateTime.now();
+                updateAndCreateFile(currentDate);
+                final String dateForLog = dateFormatterForLogs(currentDate);
+                logMsgToFile(level, tag, msg, dateForLog);
+            }
         }
     }
 
-    private void logToFile(Level level, String msg, Throwable throwable) {
-        if (!isLoggable(level)){
-            return;
-        }
-        synchronized (lockToWrite) {
-            Calendar currentDate = new GregorianCalendar();
-            updateAndCreateFile(currentDate);
-            String dateForLog = dateFormaterForLogs(currentDate);
-            logMsgToFile(level, msg, dateForLog);
-            logThrowableToFile(level, throwable, dateForLog);
+    private static void logToFile(Level level, @NotNull String tag, @NotNull String msg, @NotNull Throwable throwable) {
+        if (isLoggable(level)) {
+            synchronized (lockToWrite) {
+                final LocalDateTime currentDate = LocalDateTime.now();
+                updateAndCreateFile(currentDate);
+                final String dateForLog = dateFormatterForLogs(currentDate);
+                logMsgToFile(level, tag, msg, dateForLog);
+                logThrowableToFile(level, tag, throwable, dateForLog);
+            }
         }
     }
 
-    private void logMsgToFile(Level level, String msg, String dateForLog) {
-        dateForLog += " [" + logger.getName() + "]"  + level.toString() + " - " + msg;
-        logsToFile.add(dateForLog);
+    private static void logMsgToFile(@NotNull Level level, @NotNull String tag, @NotNull String msg, @NotNull String dateForLog) {
+        final String logMessage = String.format("%s{%s} %s - %s", dateForLog, level.toString(), tag, msg);
+        logsToFile.add(logMessage);
         synchronized (logsToFile) {
             logsToFile.notifyAll();
         }
     }
 
-    private void logThrowableToFile(Level level, Throwable throwable, String dateForLog) {
-        String throwableLog = dateForLog + level.getName() + " - " + throwable + "\n";
+    private static void logThrowableToFile(@NotNull Level level, @NotNull String tag, @NotNull Throwable throwable, @NotNull String dateForLog) {
+        String throwableLog = String.format("%s{%s} %s - %s", dateForLog, level.toString(), tag, throwable.toString());
         for (StackTraceElement element : throwable.getStackTrace()) {
             throwableLog += "\tat " + element + "\n";
         }
@@ -346,23 +313,16 @@ public class BotLogger {
         }
     }
 
-    private boolean isLoggable(Level level) {
+    private static boolean isLoggable(Level level) {
         return logger.isLoggable(level) && BuildVars.debug;
     }
 
-    @Override
-    protected void finalize() throws Throwable {
-        logginFile.flush();
-        logginFile.close();
-        super.finalize();
-    }
-
     private static class LoggerThread extends Thread {
+
         @Override
         public void run() {
-            setPriority(Thread.MIN_PRIORITY);
             while(true) {
-                ConcurrentLinkedQueue<String> stringsToLog = new ConcurrentLinkedQueue<>();
+                final ConcurrentLinkedQueue<String> stringsToLog = new ConcurrentLinkedQueue<>();
                 synchronized (logsToFile) {
                     if (logsToFile.isEmpty()) {
                         try {
@@ -378,9 +338,7 @@ public class BotLogger {
                     logsToFile.clear();
                 }
 
-                for (String stringToLog: stringsToLog) {
-                    logginFile.println(stringToLog);
-                }
+                stringsToLog.stream().forEach(logginFile::println);
                 logginFile.flush();
             }
         }
diff --git a/src/main/java/org/telegram/services/DirectionsService.java b/src/main/java/org/telegram/services/DirectionsService.java
index 20f750b..57a0821 100644
--- a/src/main/java/org/telegram/services/DirectionsService.java
+++ b/src/main/java/org/telegram/services/DirectionsService.java
@@ -27,7 +27,7 @@ import java.util.List;
  * @date 20 of June of 2015
  */
 public class DirectionsService {
-    private static volatile BotLogger log = BotLogger.getLogger(DirectionsService.class.getName());
+    private static final String LOGTAG = "DIRECTIONSSERVICE";
 
     private static final String BASEURL = "https://maps.googleapis.com/maps/api/directions/json"; ///< Base url for REST
     private static final String APIIDEND = "&key=" + BuildVars.DirectionsApiKey;
@@ -98,7 +98,7 @@ public class DirectionsService {
                 responseToUser.add(LocalisationService.getInstance().getString("directionsNotFound", language));
             }
         } catch (Exception e) {
-            log.warning(e);
+            BotLogger.warn(LOGTAG, e);
             responseToUser.add(LocalisationService.getInstance().getString("errorFetchingDirections", language));
         }
         return responseToUser;
diff --git a/src/main/java/org/telegram/services/TimerExecutor.java b/src/main/java/org/telegram/services/TimerExecutor.java
index 1f87ce4..2346d7b 100644
--- a/src/main/java/org/telegram/services/TimerExecutor.java
+++ b/src/main/java/org/telegram/services/TimerExecutor.java
@@ -12,7 +12,7 @@ import java.util.concurrent.TimeUnit;
  * @date 27/01/25
  */
 public class TimerExecutor {
-    private static volatile BotLogger log = BotLogger.getLogger(TimerExecutor.class.getName());
+    private static final String LOGTAG = "TIMEREXECUTOR";
     private static volatile TimerExecutor instance; ///< Instance
     private static final ScheduledExecutorService executorService = Executors.newScheduledThreadPool(1); ///< Thread to execute operations
 
@@ -52,14 +52,14 @@ public class TimerExecutor {
      * @param targetSec  Second to execute it
      */
     public void startExecutionEveryDayAt(CustomTimerTask task, int targetHour, int targetMin, int targetSec) {
-        log.warn("Posting new task" + task.getTaskName());
+        BotLogger.warn(LOGTAG, "Posting new task" + task.getTaskName());
         final Runnable taskWrapper = () -> {
             try {
                 task.execute();
                 task.reduceTimes();
                 startExecutionEveryDayAt(task, targetHour, targetMin, targetSec);
             } catch (Exception e) {
-                log.severe("Bot threw an unexpected exception at TimerExecutor", e);
+                BotLogger.severe(LOGTAG, "Bot threw an unexpected exception at TimerExecutor", e);
             }
         };
         if (task.getTimes() != 0) {
@@ -100,9 +100,9 @@ public class TimerExecutor {
         try {
             executorService.awaitTermination(1, TimeUnit.DAYS);
         } catch (InterruptedException ex) {
-            log.severe(ex);
+            BotLogger.severe(LOGTAG, ex);
         } catch (Exception e) {
-            log.severe("Bot threw an unexpected exception at TimerExecutor", e);
+            BotLogger.severe(LOGTAG, "Bot threw an unexpected exception at TimerExecutor", e);
         }
     }
 }
diff --git a/src/main/java/org/telegram/services/TransifexService.java b/src/main/java/org/telegram/services/TransifexService.java
index 1c7e2bb..3f9883c 100644
--- a/src/main/java/org/telegram/services/TransifexService.java
+++ b/src/main/java/org/telegram/services/TransifexService.java
@@ -19,7 +19,7 @@ import java.io.*;
  * @date 21 of June of 2015
  */
 public class TransifexService {
-    private static volatile BotLogger log = BotLogger.getLogger(TransifexService.class.getName());
+    private static final String LOGTAG = "TRANSIFEXSERVICE";
 
     private static final String BASEURLAndroid = "http://" + BuildVars.TRANSIFEXUSER + ":" + BuildVars.TRANSIFEXPASSWORD + "@www.transifex.com/api/2/project/telegram/resource/stringsxml-48/translation/@language?file";  ///< Base url for REST
     private static final String BASEURLiOS = "http://" + BuildVars.TRANSIFEXUSER + ":" + BuildVars.TRANSIFEXPASSWORD + "@www.transifex.com/api/2/project/iphone-1/resource/localizablestrings/translation/@language?file";  ///< Base url for REST
@@ -76,7 +76,7 @@ public class TransifexService {
                 result = responseString;
             }
         } catch (IOException e) {
-            log.error(e);
+            BotLogger.error(LOGTAG, e);
         }
         return result;
     }
@@ -89,7 +89,7 @@ public class TransifexService {
             HttpResponse response = client.execute(request);
             result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE"));
         } catch (IOException e) {
-            log.error(e);
+            BotLogger.error(LOGTAG, e);
         }
         return result;
     }
@@ -102,7 +102,7 @@ public class TransifexService {
             HttpResponse response = client.execute(request);
             result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE"));
         } catch (IOException e) {
-            log.error(e);
+            BotLogger.error(LOGTAG, e);
         }
         return result;
     }
@@ -115,7 +115,7 @@ public class TransifexService {
             HttpResponse response = client.execute(request);
             result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE"));
         } catch (IOException e) {
-            log.error(e);
+            BotLogger.error(LOGTAG, e);
         }
         return result;
     }
@@ -128,7 +128,7 @@ public class TransifexService {
             HttpResponse response = client.execute(request);
             result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-8"));
         } catch (IOException e) {
-            log.error(e);
+            BotLogger.error(LOGTAG, e);
         }
         return result;
     }
@@ -141,7 +141,7 @@ public class TransifexService {
             HttpResponse response = client.execute(request);
             result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE"));
         } catch (IOException e) {
-            log.error(e);
+            BotLogger.error(LOGTAG, e);
         }
         return result;
     }
@@ -154,7 +154,7 @@ public class TransifexService {
             HttpResponse response = client.execute(request);
             result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE"));
         } catch (IOException e) {
-            log.error(e);
+            BotLogger.error(LOGTAG, e);
         }
         return result;
     }
@@ -194,11 +194,11 @@ public class TransifexService {
                     sendDocument = new SendDocument();
                     sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName);
                 } catch (FileNotFoundException e) {
-                    log.error(e);
+                    BotLogger.error(LOGTAG, e);
                 }
             }
         } catch (Exception e) {
-            log.error(e);
+            BotLogger.error(LOGTAG, e);
         }
         return sendDocument;
     }
@@ -221,11 +221,11 @@ public class TransifexService {
                     sendDocument = new SendDocument();
                     sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName);
                 } catch (FileNotFoundException e) {
-                    log.error(e);
+                    BotLogger.error(LOGTAG, e);
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            BotLogger.error(LOGTAG, e);
         }
         return sendDocument;
     }
@@ -249,11 +249,11 @@ public class TransifexService {
                     sendDocument = new SendDocument();
                     sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName);
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    BotLogger.error(LOGTAG, e);
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            BotLogger.error(LOGTAG, e);
         }
         return sendDocument;
     }
@@ -276,11 +276,11 @@ public class TransifexService {
                     sendDocument = new SendDocument();
                     sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName);
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    BotLogger.error(LOGTAG, e);
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            BotLogger.error(LOGTAG, e);
         }
         return sendDocument;
     }
diff --git a/src/main/java/org/telegram/services/WeatherService.java b/src/main/java/org/telegram/services/WeatherService.java
index d96c1d0..880a92a 100644
--- a/src/main/java/org/telegram/services/WeatherService.java
+++ b/src/main/java/org/telegram/services/WeatherService.java
@@ -26,7 +26,7 @@ import java.time.format.DateTimeFormatter;
  * @date 20 of June of 2015
  */
 public class WeatherService {
-    private static volatile BotLogger log = BotLogger.getLogger(WeatherService.class.getName());
+    private static final String LOGTAG = "WEATHERSERVICE";
 
     public static final String METRICSYSTEM = "metric";
     public static final String IMPERIALSYSTEM = "imperial";
@@ -90,7 +90,7 @@ public class WeatherService {
             String responseString = EntityUtils.toString(buf, "UTF-8");
 
             JSONObject jsonObject = new JSONObject(responseString);
-            log.warning(jsonObject.toString());
+            BotLogger.info(LOGTAG, jsonObject.toString());
             if (jsonObject.getInt("cod") == 200) {
                 cityFound = jsonObject.getJSONObject("city").getString("name") + " (" +
                         jsonObject.getJSONObject("city").getString("country") + ")";
@@ -98,11 +98,11 @@ public class WeatherService {
                 responseToUser = String.format(LocalisationService.getInstance().getString("weatherAlert", language),
                         cityFound, convertListOfForecastToString(jsonObject, language, units, false));
             } else {
-                log.warning(jsonObject.toString());
+                BotLogger.warn(LOGTAG, jsonObject.toString());
                 responseToUser = LocalisationService.getInstance().getString("cityNotFound", language);
             }
         } catch (Exception e) {
-            log.error(e);
+            BotLogger.error(LOGTAG, e);
             responseToUser = LocalisationService.getInstance().getString("errorFetchingWeather", language);
         }
         return responseToUser;
@@ -131,7 +131,7 @@ public class WeatherService {
             String responseString = EntityUtils.toString(buf, "UTF-8");
 
             JSONObject jsonObject = new JSONObject(responseString);
-            log.warning(jsonObject.toString());
+            BotLogger.info(LOGTAG, jsonObject.toString());
             if (jsonObject.getInt("cod") == 200) {
                 cityFound = jsonObject.getJSONObject("city").getString("name") + " (" +
                         jsonObject.getJSONObject("city").getString("country") + ")";
@@ -139,11 +139,11 @@ public class WeatherService {
                 responseToUser = String.format(LocalisationService.getInstance().getString("weatherForcast", language),
                         cityFound, convertListOfForecastToString(jsonObject, language, units, true));
             } else {
-                log.warning(jsonObject.toString());
+                BotLogger.warn(LOGTAG, jsonObject.toString());
                 responseToUser = LocalisationService.getInstance().getString("cityNotFound", language);
             }
         } catch (Exception e) {
-            log.error(e);
+            BotLogger.error(LOGTAG, e);
             responseToUser = LocalisationService.getInstance().getString("errorFetchingWeather", language);
         }
         return responseToUser;
@@ -178,11 +178,11 @@ public class WeatherService {
                 responseToUser = String.format(LocalisationService.getInstance().getString("weatherForcast", language),
                         cityFound, convertListOfForecastToString(jsonObject, language, units, true));
             } else {
-                log.warning(jsonObject.toString());
+                BotLogger.warn(LOGTAG, jsonObject.toString());
                 responseToUser = LocalisationService.getInstance().getString("cityNotFound", language);
             }
         } catch (Exception e) {
-            log.error(e);
+            BotLogger.error(LOGTAG, e);
             responseToUser = LocalisationService.getInstance().getString("errorFetchingWeather", language);
         }
         return responseToUser;
@@ -219,11 +219,11 @@ public class WeatherService {
                 responseToUser = String.format(LocalisationService.getInstance().getString("weatherCurrent", language),
                         cityFound, convertCurrentWeatherToString(jsonObject, language, units, emoji));
             } else {
-                log.warning(jsonObject.toString());
+                BotLogger.warn(LOGTAG, jsonObject.toString());
                 responseToUser = LocalisationService.getInstance().getString("cityNotFound", language);
             }
         } catch (Exception e) {
-            log.error(e);
+            BotLogger.error(LOGTAG, e);
             responseToUser = LocalisationService.getInstance().getString("errorFetchingWeather", language);
         }
         return responseToUser;
@@ -258,11 +258,11 @@ public class WeatherService {
                 responseToUser = String.format(LocalisationService.getInstance().getString("weatherCurrent", language),
                         cityFound, convertCurrentWeatherToString(jsonObject, language, units, null));
             } else {
-                log.warning(jsonObject.toString());
+                BotLogger.warn(LOGTAG, jsonObject.toString());
                 responseToUser = LocalisationService.getInstance().getString("cityNotFound", language);
             }
         } catch (Exception e) {
-            log.error(e);
+            BotLogger.error(LOGTAG, e);
             responseToUser = LocalisationService.getInstance().getString("errorFetchingWeather", language);
         }
         return responseToUser;
diff --git a/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java b/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java
new file mode 100644
index 0000000..f8272fa
--- /dev/null
+++ b/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java
@@ -0,0 +1,183 @@
+package org.telegram.updateshandlers;
+
+import org.telegram.BotConfig;
+import org.telegram.BuildVars;
+import org.telegram.SenderHelper;
+import org.telegram.api.methods.BotApiMethod;
+import org.telegram.api.methods.SendMessage;
+import org.telegram.api.objects.*;
+import org.telegram.services.BotLogger;
+import org.telegram.updatesreceivers.UpdatesThread;
+import org.telegram.updatesreceivers.Webhook;
+
+import java.io.InvalidObjectException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author Ruben Bermudez
+ * @version 1.0
+ * @brief Handler for updates to channel updates bot
+ * This is a use case that will send a message to a channel if it is added as an admin to it.
+ * @date 24 of June of 2015
+ */
+public class ChannelHandlers implements UpdatesCallback {
+    private static final String LOGTAG = "CHANNELHANDLERS";
+    private static final String TOKEN = BotConfig.TOKENCHANNEL;
+    private static final String BOTNAME = BotConfig.USERNAMECHANNEL;
+    private static final boolean USEWEBHOOK = false;
+
+    private static final int WAITINGCHANNEL = 1;
+
+    private static final String HELP_TEXT = "Send me the channel username where you added me as admin.";
+    private static final String CANCEL_COMMAND = "/stop";
+    private static final String AFTER_CHANNEL_TEXT = "A message to provided channel will be sent if the bot was added to it as admin.";
+    private static final String WRONG_CHANNEL_TEXT = "Wrong username, please remember to add *@* before the username and send only the username.";
+    private static final String CHANNEL_MESSAGE_TEXT = "This message was sent by *@updateschannelbot*. Enjoy!";
+    private static final String ERROR_MESSAGE_TEXT = "There was an error sending the message to channel *%s*, the error was: ```%s```";
+
+    private final ConcurrentHashMap<Integer, Integer> userState = new ConcurrentHashMap<>();
+
+    private final Object webhookLock = new Object();
+
+    public ChannelHandlers(Webhook webhook) {
+        if (USEWEBHOOK && BuildVars.useWebHook) {
+            webhook.registerWebhook(this, BOTNAME);
+            SenderHelper.SendWebhook(Webhook.getExternalURL(BOTNAME), TOKEN);
+        } else {
+            SenderHelper.SendWebhook("", TOKEN);
+            new UpdatesThread(TOKEN, this);
+        }
+    }
+
+    @Override
+    public void onUpdateReceived(Update update) {
+        Message message = update.getMessage();
+        if (message != null && message.hasText()) {
+            try {
+                BotApiMethod botApiMethod = handleIncomingMessage(message);
+                if (botApiMethod != null) {
+                    SenderHelper.SendApiMethod(botApiMethod, TOKEN);
+                }
+            } catch (InvalidObjectException e) {
+                BotLogger.severe(LOGTAG, e);
+            }
+        }
+    }
+
+    @Override
+    public BotApiMethod onWebhookUpdateReceived(Update update) {
+        throw new NoSuchMethodError();
+    }
+
+
+    // region Incoming messages handlers
+
+    private BotApiMethod handleIncomingMessage(Message message) throws InvalidObjectException {
+        int state = userState.getOrDefault(message.getFrom().getId(), 0);
+        BotApiMethod botApiMethod;
+        switch(state) {
+            case WAITINGCHANNEL:
+                botApiMethod = onWaitingChannelMessage(message);
+                break;
+            default:
+                botApiMethod = sendHelpMessage(message.getChatId().toString(), message.getMessageId(), null);
+                userState.put(message.getFrom().getId(), WAITINGCHANNEL);
+                break;
+        }
+        return botApiMethod;
+    }
+
+    private BotApiMethod onWaitingChannelMessage(Message message) throws InvalidObjectException {
+        BotApiMethod sendMessage = null;
+        if (message.getText().equals(CANCEL_COMMAND)) {
+            userState.remove(message.getFrom().getId());
+            sendMessage = sendHelpMessage(message.getChatId().toString(), message.getMessageId(), null);
+        } else {
+            if (message.getText().startsWith("@") && !message.getText().trim().contains(" ")) {
+                sendBuiltMessage(getMessageToChannelSent(message));
+                sendMessageToChannel(message.getText(), message);
+                userState.remove(message.getFrom().getId());
+            } else {
+                sendMessage = getWrongUsernameMessage(message);
+            }
+        }
+
+        return sendMessage;
+    }
+
+    private static void sendMessageToChannel(String username, Message message) {
+        SendMessage sendMessage = new SendMessage();
+        sendMessage.enableMarkdown(true);
+        sendMessage.setChatId(username.trim());
+
+        sendMessage.setText(CHANNEL_MESSAGE_TEXT);
+        sendMessage.enableMarkdown(true);
+
+        try {
+            sendBuiltMessage(sendMessage);
+        } catch (InvalidObjectException e) {
+            sendErrorMessage(message, e.getMessage());
+        }
+    }
+
+    private static void sendErrorMessage(Message message, String errorText) {
+        SendMessage sendMessage = new SendMessage();
+        sendMessage.enableMarkdown(true);
+        sendMessage.setChatId(message.getChatId().toString());
+        sendMessage.setReplayToMessageId(message.getMessageId());
+
+        sendMessage.setText(String.format(ERROR_MESSAGE_TEXT, message.getText().trim(), errorText.replace("\"", "\\\"")));
+        sendMessage.enableMarkdown(true);
+
+        try {
+            sendBuiltMessage(sendMessage);
+        } catch (InvalidObjectException e) {
+            BotLogger.error(LOGTAG, e);
+        }
+    }
+
+    private static BotApiMethod getWrongUsernameMessage(Message message) {
+        SendMessage sendMessage = new SendMessage();
+        sendMessage.enableMarkdown(true);
+        sendMessage.setChatId(message.getChatId().toString());
+        sendMessage.setReplayToMessageId(message.getMessageId());
+
+        ForceReplyKeyboard forceReplyKeyboard = new ForceReplyKeyboard();
+        forceReplyKeyboard.setSelective(true);
+        forceReplyKeyboard.setForceReply(true);
+        sendMessage.setReplayMarkup(forceReplyKeyboard);
+
+        sendMessage.setText(WRONG_CHANNEL_TEXT);
+        sendMessage.enableMarkdown(true);
+        return sendMessage;
+    }
+
+    private static SendMessage getMessageToChannelSent(Message message) {
+        SendMessage sendMessage = new SendMessage();
+        sendMessage.enableMarkdown(true);
+        sendMessage.setChatId(message.getChatId().toString());
+        sendMessage.setReplayToMessageId(message.getMessageId());
+
+        sendMessage.setText(AFTER_CHANNEL_TEXT);
+        return sendMessage;
+    }
+
+    private static BotApiMethod sendHelpMessage(String chatId, Integer messageId, ReplyKeyboardMarkup replyKeyboardMarkup) {
+        SendMessage sendMessage = new SendMessage();
+        sendMessage.enableMarkdown(true);
+        sendMessage.setChatId(chatId);
+        sendMessage.setReplayToMessageId(messageId);
+        if (replyKeyboardMarkup != null) {
+            sendMessage.setReplayMarkup(replyKeyboardMarkup);
+        }
+
+        sendMessage.setText(HELP_TEXT);
+        return sendMessage;
+    }
+
+    private static void sendBuiltMessage(SendMessage sendMessage) throws InvalidObjectException {
+        SenderHelper.SendApiMethod(sendMessage, TOKEN);
+    }
+}
diff --git a/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java b/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java
index 7af5165..cbb867e 100644
--- a/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java
+++ b/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java
@@ -6,11 +6,13 @@ import org.telegram.api.objects.*;
 import org.telegram.database.DatabaseManager;
 import org.telegram.api.methods.BotApiMethod;
 import org.telegram.api.methods.SendMessage;
+import org.telegram.services.BotLogger;
 import org.telegram.services.DirectionsService;
 import org.telegram.services.LocalisationService;
 import org.telegram.updatesreceivers.UpdatesThread;
 import org.telegram.updatesreceivers.Webhook;
 
+import java.io.InvalidObjectException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -24,6 +26,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
  * @date 24 of June of 2015
  */
 public class DirectionsHandlers implements UpdatesCallback {
+    private static final String LOGTAG = "DIRECTIONSHANDLERS";
     private static final String TOKEN = BotConfig.TOKENDIRECTIONS;
     private static final String BOTNAME = BotConfig.USERNAMEDIRECTIONS;
     private static final boolean USEWEBHOOK = false;
@@ -44,7 +47,11 @@ public class DirectionsHandlers implements UpdatesCallback {
 
     @Override
     public void onUpdateReceived(Update update) {
-        handleDirections(update);
+        try {
+            handleDirections(update);
+        } catch (InvalidObjectException e) {
+            BotLogger.error(LOGTAG, e);
+        }
     }
 
     @Override
@@ -53,7 +60,7 @@ public class DirectionsHandlers implements UpdatesCallback {
         return null;
     }
 
-    public void handleDirections(Update update) {
+    public void handleDirections(Update update) throws InvalidObjectException {
         Message message = update.getMessage();
         if (message != null && message.hasText()) {
             if (languageMessages.contains(message.getFrom().getId())) {
@@ -149,7 +156,7 @@ public class DirectionsHandlers implements UpdatesCallback {
 
     }
 
-    private void sendHelpMessage(Message message, String language) {
+    private void sendHelpMessage(Message message, String language) throws InvalidObjectException {
         SendMessage sendMessageRequest = new SendMessage();
         String helpDirectionsFormated = String.format(
                 LocalisationService.getInstance().getString("helpDirections", language),
@@ -185,7 +192,7 @@ public class DirectionsHandlers implements UpdatesCallback {
 
     }
 
-    private void onSetLanguageCommand(Message message, String language) {
+    private void onSetLanguageCommand(Message message, String language) throws InvalidObjectException {
         SendMessage sendMessageRequest = new SendMessage();
         sendMessageRequest.setChatId(message.getChatId().toString());
         ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup();
@@ -206,7 +213,7 @@ public class DirectionsHandlers implements UpdatesCallback {
         languageMessages.add(message.getFrom().getId());
     }
 
-    private void onLanguageSelected(Message message) {
+    private void onLanguageSelected(Message message) throws InvalidObjectException {
         String[] parts = message.getText().split("-->", 2);
         SendMessage sendMessageRequest = new SendMessage();
         sendMessageRequest.setChatId(message.getChatId().toString());
diff --git a/src/main/java/org/telegram/updateshandlers/FilesHandlers.java b/src/main/java/org/telegram/updateshandlers/FilesHandlers.java
index 433ce9c..fce8398 100644
--- a/src/main/java/org/telegram/updateshandlers/FilesHandlers.java
+++ b/src/main/java/org/telegram/updateshandlers/FilesHandlers.java
@@ -12,11 +12,13 @@ import org.telegram.database.DatabaseManager;
 import org.telegram.api.methods.BotApiMethod;
 import org.telegram.api.methods.SendDocument;
 import org.telegram.api.methods.SendMessage;
+import org.telegram.services.BotLogger;
 import org.telegram.services.Emoji;
 import org.telegram.services.LocalisationService;
 import org.telegram.updatesreceivers.UpdatesThread;
 import org.telegram.updatesreceivers.Webhook;
 
+import java.io.InvalidObjectException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -31,6 +33,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
  * @date 24 of June of 2015
  */
 public class FilesHandlers implements UpdatesCallback {
+    private static final String LOGTAG = "FILESHANDLERS";
     private static final String TOKEN = BotConfig.TOKENFILES;
     private static final String BOTNAME = BotConfig.USERNAMEFILES;
     private static final boolean USEWEBHOOK = false;
@@ -51,7 +54,11 @@ public class FilesHandlers implements UpdatesCallback {
 
     @Override
     public void onUpdateReceived(Update update) {
-        handleFileUpdate(update);
+        try {
+            handleFileUpdate(update);
+        } catch (InvalidObjectException e) {
+            BotLogger.error(LOGTAG, e);
+        }
     }
 
     @Override
@@ -60,7 +67,7 @@ public class FilesHandlers implements UpdatesCallback {
         return null;
     }
 
-    public void handleFileUpdate(Update update) {
+    public void handleFileUpdate(Update update) throws InvalidObjectException {
         Message message = update.getMessage();
         if (message != null && message.hasText()) {
             if (languageMessages.contains(message.getFrom().getId())) {
@@ -104,7 +111,7 @@ public class FilesHandlers implements UpdatesCallback {
         }
     }
 
-    private void onListCommand(Message message, String language) {
+    private void onListCommand(Message message, String language) throws InvalidObjectException {
         HashMap<String, String> files = DatabaseManager.getInstance().getFilesByUser(message.getFrom().getId());
         SendMessage sendMessageRequest = new SendMessage();
         if (files.size() > 0) {
@@ -124,7 +131,7 @@ public class FilesHandlers implements UpdatesCallback {
         SenderHelper.SendApiMethod(sendMessageRequest, TOKEN);
     }
 
-    private void onDeleteCommand(Message message, String language, String[] parts) {
+    private void onDeleteCommand(Message message, String language, String[] parts) throws InvalidObjectException {
         if (DatabaseManager.getInstance().getUserStatusForFile(message.getFrom().getId()) == DELETE_UPLOADED_STATUS &&
                 parts.length == 2) {
             onDeleteCommandWithParameters(message, language, parts[1]);
@@ -133,7 +140,7 @@ public class FilesHandlers implements UpdatesCallback {
         }
     }
 
-    private void onDeleteCommandWithoutParameters(Message message, String language) {
+    private void onDeleteCommandWithoutParameters(Message message, String language) throws InvalidObjectException {
         DatabaseManager.getInstance().addUserForFile(message.getFrom().getId(), DELETE_UPLOADED_STATUS);
         SendMessage sendMessageRequest = new SendMessage();
         sendMessageRequest.setText(LocalisationService.getInstance().getString("deleteUploadedFile", language));
@@ -156,7 +163,7 @@ public class FilesHandlers implements UpdatesCallback {
         SenderHelper.SendApiMethod(sendMessageRequest, TOKEN);
     }
 
-    private void onDeleteCommandWithParameters(Message message, String language, String part) {
+    private void onDeleteCommandWithParameters(Message message, String language, String part) throws InvalidObjectException {
         String[] innerParts = part.split(Emoji.LEFT_RIGHT_ARROW.toString(), 2);
         boolean removed = DatabaseManager.getInstance().deleteFile(innerParts[0].trim());
         SendMessage sendMessageRequest = new SendMessage();
@@ -170,7 +177,7 @@ public class FilesHandlers implements UpdatesCallback {
         DatabaseManager.getInstance().deleteUserForFile(message.getFrom().getId());
     }
 
-    private void onCancelCommand(Message message, String language) {
+    private void onCancelCommand(Message message, String language) throws InvalidObjectException {
         DatabaseManager.getInstance().deleteUserForFile(message.getFrom().getId());
         SendMessage sendMessageRequest = new SendMessage();
         sendMessageRequest.setText(LocalisationService.getInstance().getString("processFinished", language));
@@ -178,7 +185,7 @@ public class FilesHandlers implements UpdatesCallback {
         SenderHelper.SendApiMethod(sendMessageRequest, TOKEN);
     }
 
-    private void onUploadCommand(Message message, String language) {
+    private void onUploadCommand(Message message, String language) throws InvalidObjectException {
         DatabaseManager.getInstance().addUserForFile(message.getFrom().getId(), INITIAL_UPLOAD_STATUS);
         SendMessage sendMessageRequest = new SendMessage();
         sendMessageRequest.setText(LocalisationService.getInstance().getString("sendFileToUpload", language));
@@ -186,7 +193,7 @@ public class FilesHandlers implements UpdatesCallback {
         SenderHelper.SendApiMethod(sendMessageRequest, TOKEN);
     }
 
-    private void sendHelpMessage(Message message, String language) {
+    private void sendHelpMessage(Message message, String language) throws InvalidObjectException {
         SendMessage sendMessageRequest = new SendMessage();
         String formatedString = String.format(
                 LocalisationService.getInstance().getString("helpFiles", language),
@@ -197,7 +204,7 @@ public class FilesHandlers implements UpdatesCallback {
         SenderHelper.SendApiMethod(sendMessageRequest, TOKEN);
     }
 
-    private void onStartWithParameters(Message message, String language, String part) {
+    private void onStartWithParameters(Message message, String language, String part) throws InvalidObjectException {
         if (DatabaseManager.getInstance().doesFileExists(part.trim())) {
             SendDocument sendDocumentRequest = new SendDocument();
             sendDocumentRequest.setDocument(part.trim());
@@ -211,7 +218,7 @@ public class FilesHandlers implements UpdatesCallback {
         }
     }
 
-    private void onSetLanguageCommand(Message message, String language) {
+    private void onSetLanguageCommand(Message message, String language) throws InvalidObjectException {
         SendMessage sendMessageRequest = new SendMessage();
         sendMessageRequest.setChatId(message.getChatId().toString());
         ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup();
@@ -232,7 +239,7 @@ public class FilesHandlers implements UpdatesCallback {
         languageMessages.add(message.getFrom().getId());
     }
 
-    private void onLanguageReceived(Message message) {
+    private void onLanguageReceived(Message message) throws InvalidObjectException {
         String[] parts = message.getText().split(Emoji.LEFT_RIGHT_ARROW.toString(), 2);
         SendMessage sendMessageRequest = new SendMessage();
         sendMessageRequest.setChatId(message.getChatId().toString());
diff --git a/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java b/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java
index 01d29f4..56b3297 100644
--- a/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java
+++ b/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java
@@ -7,11 +7,14 @@ import org.telegram.database.DatabaseManager;
 import org.telegram.api.methods.BotApiMethod;
 import org.telegram.api.methods.SendDocument;
 import org.telegram.api.methods.SendMessage;
+import org.telegram.services.BotLogger;
 import org.telegram.services.LocalisationService;
 import org.telegram.services.TransifexService;
 import org.telegram.updatesreceivers.UpdatesThread;
 import org.telegram.updatesreceivers.Webhook;
 
+import java.io.InvalidObjectException;
+
 /**
  * @author Ruben Bermudez
  * @version 1.0
@@ -19,6 +22,7 @@ import org.telegram.updatesreceivers.Webhook;
  * @date 24 of June of 2015
  */
 public class TransifexHandlers implements UpdatesCallback {
+    private static final String LOGTAG = "TRANSIFEXHANDLERS";
     private static final String TOKEN = BotConfig.TOKENTRANSIFEX;
     private static final String BOTNAME = BotConfig.USERNAMETRANSIFEX;
     private static final boolean USEWEBHOOK = false;
@@ -35,7 +39,11 @@ public class TransifexHandlers implements UpdatesCallback {
 
     @Override
     public void onUpdateReceived(Update update) {
-        sendTransifexFile(update);
+        try {
+            sendTransifexFile(update);
+        } catch (InvalidObjectException e) {
+            BotLogger.error(LOGTAG, e);
+        }
     }
 
     @Override
@@ -44,7 +52,7 @@ public class TransifexHandlers implements UpdatesCallback {
         return null;
     }
 
-    public void sendTransifexFile(Update update) {
+    public void sendTransifexFile(Update update) throws InvalidObjectException {
         Message message = update.getMessage();
         if (message != null && message.hasText()) {
             String language = DatabaseManager.getInstance().getUserLanguage(update.getMessage().getFrom().getId());
diff --git a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
index 7793479..dcec189 100644
--- a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
+++ b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
@@ -13,6 +13,7 @@ import org.telegram.structure.WeatherAlert;
 import org.telegram.updatesreceivers.UpdatesThread;
 import org.telegram.updatesreceivers.Webhook;
 
+import java.io.InvalidObjectException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,6 +25,7 @@ import java.util.List;
  * @date 24 of June of 2015
  */
 public class WeatherHandlers implements UpdatesCallback {
+    private static final String LOGTAG = "WEATHERHANDLERS";
     private static final String TOKEN = BotConfig.TOKENWEATHER;
     private static final String BOTNAME = BotConfig.USERNAMEWEATHER;
     private static final boolean USEWEBHOOK = true;
@@ -91,7 +93,11 @@ public class WeatherHandlers implements UpdatesCallback {
         Message message = update.getMessage();
         if (message != null) {
             BotApiMethod botApiMethod = handleIncomingMessage(message);
-            SenderHelper.SendApiMethod(botApiMethod, TOKEN);
+            try {
+                SenderHelper.SendApiMethod(botApiMethod, TOKEN);
+            } catch (InvalidObjectException e) {
+                BotLogger.error(LOGTAG, e);
+            }
         }
     }
 
@@ -180,8 +186,12 @@ public class WeatherHandlers implements UpdatesCallback {
         replyKeyboardHide.setHideKeyboard(true);
         sendMessage.setReplayMarkup(replyKeyboardHide);
 
-        SenderHelper.SendApiMethod(sendMessage, TOKEN);
-        DatabaseManager.getInstance().insertWeatherState(userId, chatId, STARTSTATE);
+        try {
+            SenderHelper.SendApiMethod(sendMessage, TOKEN);
+            DatabaseManager.getInstance().insertWeatherState(userId, chatId, STARTSTATE);
+        } catch (InvalidObjectException e) {
+            BotLogger.error(LOGTAG, e);
+        }
 
     }
 
@@ -1243,7 +1253,11 @@ public class WeatherHandlers implements UpdatesCallback {
     // region Helper Methods
 
     private static void sendBuiltMessage(SendMessage sendMessage) {
-        SenderHelper.SendApiMethod(sendMessage, TOKEN);
+        try {
+            SenderHelper.SendApiMethod(sendMessage, TOKEN);
+        } catch (InvalidObjectException e) {
+            BotLogger.severe(LOGTAG, e);
+        }
     }
 
     // endregion Helper Methods
diff --git a/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java b/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java
index 1562242..051b8f9 100644
--- a/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java
+++ b/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java
@@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit;
  * @date 20 of June of 2015
  */
 public class UpdatesThread {
-    private static volatile BotLogger log = BotLogger.getLogger(UpdatesThread.class.getName());
+    private static final String LOGTAG = "UPDATESTHREAD";
 
     private final UpdatesCallback callback;
     private final ReaderThread readerThread;
@@ -67,7 +67,7 @@ public class UpdatesThread {
                     httpPost.addHeader("charset", "UTF-8");
                     httpPost.setEntity(new StringEntity(request.toJson().toString(), ContentType.APPLICATION_JSON));
                     HttpResponse response;
-                    log.debug(httpPost.toString());
+                    BotLogger.debug(LOGTAG, httpPost.toString());
                     response = httpclient.execute(httpPost);
                     HttpEntity ht = response.getEntity();
 
@@ -80,7 +80,7 @@ public class UpdatesThread {
                             throw new InvalidObjectException(jsonObject.toString());
                         }
                         JSONArray jsonArray = jsonObject.getJSONArray("result");
-                        log.debug(jsonArray.toString());
+                        BotLogger.debug(LOGTAG, jsonArray.toString());
                         if (jsonArray.length() != 0) {
                             for (int i = 0; i < jsonArray.length(); i++) {
                                 Update update = new Update(jsonArray.getJSONObject(i));
@@ -98,15 +98,15 @@ public class UpdatesThread {
                                     this.wait(500);
                                 }
                             } catch (InterruptedException e) {
-                                log.error(e);
+                                BotLogger.error(LOGTAG, e);
                                 continue;
                             }
                         }
                     } catch (JSONException e) {
-                        log.warning(e);
+                        BotLogger.warn(LOGTAG, e);
                     }
                 } catch (IOException e) {
-                    log.warning(e);
+                    BotLogger.warn(LOGTAG, e);
                 }
             }
         }
@@ -124,7 +124,7 @@ public class UpdatesThread {
                             try {
                                 receivedUpdates.wait();
                             } catch (InterruptedException e) {
-                                log.error(e);
+                                BotLogger.error(LOGTAG, e);
                                 continue;
                             }
                             update = receivedUpdates.pollLast();
@@ -136,7 +136,7 @@ public class UpdatesThread {
                     DatabaseManager.getInstance().putLastUpdate(token, update.getUpdateId());
                     callback.onUpdateReceived(update);
                 } catch (Exception e) {
-                    log.error(e);
+                    BotLogger.error(LOGTAG, e);
                 }
             }
         }
diff --git a/src/main/java/org/telegram/updatesreceivers/Webhook.java b/src/main/java/org/telegram/updatesreceivers/Webhook.java
index f1a1036..e9a97a0 100644
--- a/src/main/java/org/telegram/updatesreceivers/Webhook.java
+++ b/src/main/java/org/telegram/updatesreceivers/Webhook.java
@@ -21,7 +21,7 @@ import java.net.URI;
  * @date 20 of June of 2015
  */
 public class Webhook {
-    private static volatile BotLogger log = BotLogger.getLogger(Webhook.class.getName());
+    private static final String LOGTAG = "WEBHOOK";
 
     private static final String KEYSTORE_SERVER_FILE = "./keystore_server";
     private static final String KEYSTORE_SERVER_PWD = "asdfgh";
@@ -47,7 +47,7 @@ public class Webhook {
         rc.register(restApi);
         rc.register(JacksonFeature.class);
         rc.property(JSONConfiguration.FEATURE_POJO_MAPPING, true);
-        log.error("Internal webhook: " + getBaseURI().toString());
+        BotLogger.info(LOGTAG, "Internal webhook: " + getBaseURI().toString());
         final HttpServer grizzlyServer = GrizzlyHttpServerFactory.createHttpServer(
                 getBaseURI(),
                 rc,
@@ -56,7 +56,7 @@ public class Webhook {
         try {
             grizzlyServer.start();
         } catch (IOException e) {
-            log.error(e);
+            BotLogger.error(LOGTAG, e);
         }
     }
 

From 781f5d075b9494acbe18e94ccfd238be6ac059d9 Mon Sep 17 00:00:00 2001
From: Rubenlagu <rberlopez@gmail.com>
Date: Wed, 11 Nov 2015 23:49:01 +0100
Subject: [PATCH 03/10] 1. Esperanto

---
 .idea/resourceBundles.xml                     |  11 +
 .idea/workspace.xml                           | 356 +++++++-----------
 .../services/LocalisationService.java         |   6 +
 .../localisation/strings_eo.properties        |  75 ++++
 4 files changed, 235 insertions(+), 213 deletions(-)
 create mode 100644 .idea/resourceBundles.xml
 create mode 100644 src/main/resources/localisation/strings_eo.properties

diff --git a/.idea/resourceBundles.xml b/.idea/resourceBundles.xml
new file mode 100644
index 0000000..7267597
--- /dev/null
+++ b/.idea/resourceBundles.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ResourceBundleManager">
+    <file url="file://$PROJECT_DIR$/src/main/resources/localisation/strings.properties" />
+    <file url="file://$PROJECT_DIR$/src/main/resources/localisation/strings_eo.properties" />
+    <file url="file://$PROJECT_DIR$/src/main/resources/localisation/strings_es.properties" />
+    <file url="file://$PROJECT_DIR$/src/main/resources/localisation/strings_it.properties" />
+    <file url="file://$PROJECT_DIR$/src/main/resources/localisation/strings_nl.properties" />
+    <file url="file://$PROJECT_DIR$/src/main/resources/localisation/strings_pt.properties" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fd488de..61f4b0f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,26 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="cc3252dd-ba1f-404e-b603-ef880b5c3341" name="Default" comment="1. Webhooks&#10;">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/resourceBundles.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/resources/localisation/strings_eo.properties" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/services/BotLogger.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/services/BotLogger.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/database/ConectionDB.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/database/ConectionDB.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/services/DirectionsService.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/services/DirectionsService.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/services/LocalisationService.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/services/LocalisationService.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/services/TimerExecutor.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/services/TimerExecutor.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/services/TransifexService.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/services/TransifexService.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/services/WeatherService.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/services/WeatherService.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dataSources.xml" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="BotAPi.iws" />
@@ -66,65 +52,21 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="BuildVars.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="10" column="29" selection-start-line="10" selection-start-column="29" selection-end-line="10" selection-end-column="29" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="BotConfig.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="CustomTimerTask.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/CustomTimerTask.java">
+      <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/Main.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="8" column="22" selection-start-line="8" selection-start-column="22" selection-end-line="8" selection-end-column="22" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="ChannelHandlers.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-9.296296">
-              <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" />
+              <caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Message.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="233" column="0" selection-start-line="233" selection-start-column="0" selection-end-line="233" selection-end-column="0" />
-              <folding>
-                <element signature="e#8853#8854#0" expanded="true" />
-                <element signature="e#8888#8889#0" expanded="true" />
-                <element signature="e#9500#9501#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="SenderHelper.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="SenderHelper.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="265" column="82" selection-start-line="265" selection-start-column="82" selection-end-line="265" selection-end-column="82" />
+            <state vertical-scroll-proportion="0.56">
+              <caret line="48" column="0" selection-start-line="48" selection-start-column="0" selection-end-line="48" selection-end-column="0" />
               <folding>
                 <element signature="docComment;class#SenderHelper#0" expanded="false" />
               </folding>
@@ -132,11 +74,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Main.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/Main.java">
+      <file leaf-file-name="BotConfig.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.64">
-              <caret line="36" column="8" selection-start-line="36" selection-start-column="8" selection-end-line="36" selection-end-column="8" />
+            <state vertical-scroll-proportion="0.0">
+              <caret line="24" column="94" selection-start-line="24" selection-start-column="94" selection-end-line="24" selection-end-column="94" />
               <folding />
             </state>
           </provider>
@@ -177,8 +119,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/Voice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/methods/GetUpdates.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/methods/SetWebhook.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendMessage.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ReplyKeyboard.java" />
@@ -214,7 +154,6 @@
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/services/TimerExecutor.java" />
@@ -224,10 +163,13 @@
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/services/WeatherService.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/services/BotLogger.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/services/LocalisationService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/localisation/strings_eo.properties" />
       </list>
     </option>
   </component>
@@ -417,6 +359,8 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="Scratches" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -474,10 +418,6 @@
               <option name="myItemId" value="localisation" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Resource Bundle 'strings'" />
-              <option name="myItemType" value="com.intellij.lang.properties.projectView.ResourceBundleNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -565,6 +505,36 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="BotAPi" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="BotAPi" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="telegram" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="structure" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="BotAPi" />
@@ -595,11 +565,23 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="BotAPi" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="BotAPi" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value=".idea" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="Scope" />
-      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -1103,7 +1085,12 @@
       <workItem from="1444323303608" duration="5644000" />
       <workItem from="1444501308862" duration="423000" />
       <workItem from="1444843707388" duration="1497000" />
-      <workItem from="1444850319963" duration="4636000" />
+      <workItem from="1444850319963" duration="4766000" />
+      <workItem from="1445735330046" duration="337000" />
+      <workItem from="1446055333504" duration="795000" />
+      <workItem from="1446066757201" duration="1347000" />
+      <workItem from="1446749977897" duration="1361000" />
+      <workItem from="1447281740198" duration="348000" />
     </task>
     <task id="LOCAL-00001" summary="First Commit:&#10;1. Transifex bot&#10;2. Weather bot">
       <created>1434854005227</created>
@@ -1393,11 +1380,17 @@
       <option name="project" value="LOCAL" />
       <updated>1444845084283</updated>
     </task>
-    <option name="localTasksCounter" value="49" />
+    <task id="LOCAL-00049" summary="1. Example of bot for channels&#10;">
+      <created>1444855140616</created>
+      <option name="number" value="00049" />
+      <option name="project" value="LOCAL" />
+      <updated>1444855140616</updated>
+    </task>
+    <option name="localTasksCounter" value="50" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="260645000" />
+    <option name="totallyTimeSpent" value="264963000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1409,7 +1402,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="0" width="1366" height="768" extended-state="0" />
+    <frame x="0" y="0" width="1366" height="768" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1486,7 +1479,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="1. Fix JSON deserialization" />
     <MESSAGE value="1. Fix webhooks, they only allow port 443" />
     <MESSAGE value="1. Fixed loggin levels" />
     <MESSAGE value="1. Several fixes" />
@@ -1511,7 +1503,8 @@
     <MESSAGE value="1. Certificate&#10;" />
     <MESSAGE value="1. Webhooks&#10;" />
     <MESSAGE value="1. Support for channels&#10;" />
-    <option name="LAST_COMMIT_MESSAGE" value="1. Support for channels&#10;" />
+    <MESSAGE value="1. Example of bot for channels&#10;" />
+    <option name="LAST_COMMIT_MESSAGE" value="1. Example of bot for channels&#10;" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1547,22 +1540,22 @@
           <option name="timeStamp" value="245" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java</url>
-          <line>278</line>
+          <url>file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java</url>
+          <line>136</line>
           <properties />
-          <option name="timeStamp" value="259" />
+          <option name="timeStamp" value="268" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java</url>
-          <line>136</line>
+          <line>118</line>
           <properties />
-          <option name="timeStamp" value="268" />
+          <option name="timeStamp" value="270" />
         </line-breakpoint>
       </breakpoints>
       <breakpoints-dialog>
         <breakpoints-dialog />
       </breakpoints-dialog>
-      <option name="time" value="269" />
+      <option name="time" value="276" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -1571,35 +1564,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/UserProfilePhotos.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.23466666">
-          <caret line="20" column="54" selection-start-line="20" selection-start-column="54" selection-end-line="20" selection-end-column="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/interfaces/BotApiObject.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.32">
-          <caret line="8" column="40" selection-start-line="8" selection-start-column="40" selection-end-line="8" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/interfaces/IToJson.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.56">
-          <caret line="14" column="51" selection-start-line="14" selection-start-column="51" selection-end-line="14" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.39228296">
-          <caret line="81" column="10" selection-start-line="81" selection-start-column="5" selection-end-line="81" selection-end-column="10" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/BotApiMethod.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.3317647">
@@ -1625,10 +1589,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.33333334">
           <caret line="963" column="18" selection-start-line="963" selection-start-column="18" selection-end-line="963" selection-end-column="18" />
-          <folding>
-            <element signature="e#32339#32340#0" expanded="false" />
-            <element signature="e#32385#32386#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1650,7 +1610,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.49333334">
           <caret line="51" column="37" selection-start-line="51" selection-start-column="37" selection-end-line="51" selection-end-column="37" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1665,10 +1624,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.44266668">
           <caret line="25" column="5" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
-          <folding>
-            <element signature="e#980#981#0" expanded="false" />
-            <element signature="e#1006#1007#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1676,12 +1631,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6">
           <caret line="15" column="82" selection-start-line="15" selection-start-column="82" selection-end-line="15" selection-end-column="82" />
-          <folding>
-            <element signature="e#1420#1421#0" expanded="false" />
-            <element signature="e#1462#1463#0" expanded="false" />
-            <element signature="e#1498#1499#0" expanded="false" />
-            <element signature="e#1530#1531#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1696,7 +1645,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.047987618">
           <caret line="47" column="5" selection-start-line="47" selection-start-column="5" selection-end-line="47" selection-end-column="5" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1711,7 +1659,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="2.1594427">
           <caret line="122" column="51" selection-start-line="122" selection-start-column="51" selection-end-line="122" selection-end-column="51" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1719,7 +1666,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.14086688">
           <caret line="38" column="5" selection-start-line="38" selection-start-column="5" selection-end-line="38" selection-end-column="5" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1727,7 +1673,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.23374613">
           <caret line="35" column="5" selection-start-line="35" selection-start-column="5" selection-end-line="35" selection-end-column="5" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1735,7 +1680,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0015479876">
           <caret line="35" column="17" selection-start-line="35" selection-start-column="17" selection-end-line="35" selection-end-column="17" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1750,7 +1694,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="127" column="13" selection-start-line="127" selection-start-column="13" selection-end-line="127" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1758,10 +1701,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5340557">
           <caret line="46" column="11" selection-start-line="46" selection-start-column="11" selection-end-line="46" selection-end-column="11" />
-          <folding>
-            <element signature="e#877#878#0" expanded="false" />
-            <element signature="e#900#901#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1769,7 +1708,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.23219815">
           <caret line="33" column="22" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1777,10 +1715,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.32507738">
           <caret line="37" column="49" selection-start-line="37" selection-start-column="49" selection-end-line="37" selection-end-column="49" />
-          <folding>
-            <element signature="e#857#858#0" expanded="false" />
-            <element signature="e#886#887#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1788,7 +1722,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-2.1114552">
           <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1796,7 +1729,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.071207434">
           <caret line="28" column="62" selection-start-line="28" selection-start-column="62" selection-end-line="28" selection-end-column="62" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1804,7 +1736,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.25541794">
           <caret line="35" column="57" selection-start-line="35" selection-start-column="57" selection-end-line="35" selection-end-column="57" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1812,7 +1743,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.25541794">
           <caret line="24" column="61" selection-start-line="24" selection-start-column="61" selection-end-line="24" selection-end-column="61" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1820,7 +1750,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.4876161">
           <caret line="22" column="81" selection-start-line="22" selection-start-column="81" selection-end-line="22" selection-end-column="81" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1828,7 +1757,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.4876161">
           <caret line="22" column="29" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="29" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1844,7 +1772,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="2.6702785">
           <caret line="138" column="36" selection-start-line="138" selection-start-column="36" selection-end-line="138" selection-end-column="36" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1852,30 +1779,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.37306502">
           <caret line="31" column="19" selection-start-line="31" selection-start-column="19" selection-end-line="31" selection-end-column="19" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="24.705883">
-          <caret line="1258" column="38" selection-start-line="1258" selection-start-column="38" selection-end-line="1258" selection-end-column="38" />
-          <folding>
-            <element signature="method#getSettingsMessage#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getHelpMessage#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getLanguageMessage#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getUnitsMessage#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getChooseNewAlertSetMessage#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getMainMenuKeyboard#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getLanguagesKeyboard#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getUnitsKeyboard#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getSettingsKeyboard#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getRecentsKeyboard#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getRecentsKeyboard#1;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getAlertsKeyboard#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getAlertsListKeyboard#0;class#WeatherHandlers#0" expanded="false" />
-            <element signature="method#getForceReply#0;class#WeatherHandlers#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1883,7 +1786,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6453901">
           <caret line="104" column="29" selection-start-line="104" selection-start-column="29" selection-end-line="104" selection-end-column="29" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1891,7 +1793,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.28368795">
           <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1899,7 +1800,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.56028366">
           <caret line="100" column="27" selection-start-line="100" selection-start-column="27" selection-end-line="100" selection-end-column="27" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1915,7 +1815,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.47517732">
           <caret line="83" column="36" selection-start-line="83" selection-start-column="36" selection-end-line="83" selection-end-column="36" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1939,56 +1838,58 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.48">
           <caret line="39" column="34" selection-start-line="39" selection-start-column="34" selection-end-line="39" selection-end-column="34" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#11493#11494#0" expanded="true" />
-            <element signature="e#11559#11560#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/CustomTimerTask.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="8" column="22" selection-start-line="8" selection-start-column="22" selection-end-line="8" selection-end-column="22" />
-          <folding />
+          <caret line="3" column="25" selection-start-line="3" selection-start-column="25" selection-end-line="3" selection-end-column="25" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state vertical-scroll-proportion="-0.04643963">
           <caret line="233" column="0" selection-start-line="233" selection-start-column="0" selection-end-line="233" selection-end-column="0" />
-          <folding>
-            <element signature="e#8853#8854#0" expanded="true" />
-            <element signature="e#8888#8889#0" expanded="true" />
-            <element signature="e#9500#9501#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="265" column="82" selection-start-line="265" selection-start-column="82" selection-end-line="265" selection-end-column="82" />
-          <folding>
-            <element signature="docComment;class#SenderHelper#0" expanded="false" />
-          </folding>
+        <state vertical-scroll-proportion="0.074666664">
+          <caret line="10" column="29" selection-start-line="10" selection-start-column="29" selection-end-line="10" selection-end-column="29" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-9.296296">
-          <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="180" column="0" selection-start-line="180" selection-start-column="0" selection-end-line="180" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/LocalisationService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.35913312">
+          <caret line="190" column="26" selection-start-line="190" selection-start-column="26" selection-end-line="190" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.1/httpclient-4.5.1-sources.jar!/org/apache/http/impl/client/HttpClientBuilder.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="10" column="29" selection-start-line="10" selection-start-column="29" selection-end-line="10" selection-end-column="29" />
+          <caret line="376" column="100" selection-start-line="376" selection-start-column="92" selection-end-line="376" selection-end-column="100" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4">
+          <caret line="101" column="9" selection-start-line="101" selection-start-column="9" selection-end-line="101" selection-end-column="9" />
           <folding />
         </state>
       </provider>
@@ -1996,19 +1897,48 @@
     <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
+          <caret line="24" column="94" selection-start-line="24" selection-start-column="94" selection-end-line="24" selection-end-column="94" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/localisation/strings_eo.properties">
+      <provider editor-type-id="ResourceBundle">
+        <state />
+      </provider>
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.7414861">
+          <caret line="75" column="0" selection-start-line="75" selection-start-column="0" selection-end-line="75" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.idea/resourceBundles.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.23291926">
+          <caret line="10" column="10" selection-start-line="10" selection-start-column="10" selection-end-line="10" selection-end-column="10" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64">
-          <caret line="36" column="8" selection-start-line="36" selection-start-column="8" selection-end-line="36" selection-end-column="8" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.56">
+          <caret line="48" column="0" selection-start-line="48" selection-start-column="0" selection-end-line="48" selection-end-column="0" />
+          <folding>
+            <element signature="docComment;class#SenderHelper#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/org/telegram/services/LocalisationService.java b/src/main/java/org/telegram/services/LocalisationService.java
index 53e923f..aab5ceb 100644
--- a/src/main/java/org/telegram/services/LocalisationService.java
+++ b/src/main/java/org/telegram/services/LocalisationService.java
@@ -31,6 +31,7 @@ public class LocalisationService {
     private ResourceBundle galician;
     private ResourceBundle persian;
     private ResourceBundle turkish;
+    private ResourceBundle esperanto;
 
     private class CustomClassLoader extends ClassLoader {
         public CustomClassLoader(ClassLoader parent) {
@@ -92,6 +93,8 @@ public class LocalisationService {
         supportedLanguages.put("nl", "Nederlands");
         italian = ResourceBundle.getBundle("localisation.strings", new Locale("it", "IT"), loader);
         supportedLanguages.put("it", "Italiano");
+        esperanto = ResourceBundle.getBundle("localisation.strings", new Locale("eo", "EO"), loader);
+        supportedLanguages.put("eo", "Esperanto");
         /*
         german = ResourceBundle.getBundle("localisation.strings", new Locale("de", "DE"), loader);
         supportedLanguages.put("de", "Deutsch");
@@ -155,6 +158,9 @@ public class LocalisationService {
                 case "it":
                     result = italian.getString(key);
                     break;
+                case "eo":
+                    result = esperanto.getString(key);
+                    break;
                 /*case "de":
                     result = german.getString(key);
                     break;
diff --git a/src/main/resources/localisation/strings_eo.properties b/src/main/resources/localisation/strings_eo.properties
new file mode 100644
index 0000000..dcdc896
--- /dev/null
+++ b/src/main/resources/localisation/strings_eo.properties
@@ -0,0 +1,75 @@
+helpTransifex= Ĉu vi estas suferanto de babela eraro? Provu min por Telegram-tradukaro.\n\nPor ricevi la plej lastatempan Telegram-tradukdosieron por lingvo\: \n|-- %s LINGVOKODO \: Ricevi la plej lastatempan iOS-tradukon.\n|-- %s LINGVOKODO \: Ricevi la plej lastatempan Android-tradukon.\n|-- %s LINGVOKODO \: Ricevi la plej lastatempan Webogram-tradukon.\n|-- %s LINGVOKODO \: Ricevi la plej lastatempan Tdesktop-tradukon.\n|-- %s LINGVOKODO \: Ricevi la plej lastatempan OSX-App-tradukon.\n|-- %s LINGVOKODO \: Ricevi la plej lastatempan Windows Phone-tradukon.\n\n2. Por ricevi ĝisdatigitan tradukdosieron por via Android-beta-aplikaĵo\: \n|-- %s LINGVOKODO \: Ricevi la plej lastatempan Android-beta-tradukon.\n\n(La lingvokodo de Esperanto estas\: eo)
+helpFiles= Ĉu vi volas konigi dosieron al piratoj? Bonvolu resti ĉi tie kun viaj boatoj\!\n\nKonigi dosierojn per ligilo\: \n|-- %s DOSIERIDENTIGILO \: Ricevi dosieron per identigilo.\n|-- %s \: Komenci dosieralŝuton.\n|-- %s \: Elekti unu de viaj dosieroj por forigi ĝin.\n|-- %s \: Montri liston de viaj alŝutitaj dosieroj.
+helpDirections= Se mapon mi havus, mi bone vojaĝus.\n\nPor ricevi veturinstrukcion inter du lokoj\: \n|-- %s \: Komenci ricevi veturinstrukcion
+sendFileToUpload= Sendu al mi dosieron kiun vi volas konigi. Certu, ke vi aligos ĝin kiel dosieron, ne kiel bildon aŭ videon.
+fileUploaded= Bone, via dosiero estas alŝutita. Sendu tiun ligilon al ĉiuj ajn, kiujn vi volas kaj ili povos elŝuti la dosieron\:\n
+deleteUploadedFile= Elektu la dosieron, kiun vi volas forigi\:
+fileDeleted= La dosiero estis forigita
+wrongFileId= Mi bedaŭras, mi ne povas trovi dosieron per tiu identigilo. Aŭ vi tajperaris aŭ ĝi estis forigita jam.
+listOfFiles= Jen viaj nunaj alŝutitaj dosieroj\:
+noFiles= Vi ne havas ajnajn alŝutitajn dosierojn ankoraŭ.
+processFinished= La nuna procezo estas nuligita.
+uploadedFileURL= https\://telegram.me/filesbot?start\=
+initDirections= Respondu al tiu mesaĝo per via deirpunkto.
+sendDestination= Respondu al tiu mesaĝo per via destino.
+youNeedReplyDirections= Mi bedaŭras, mi ne povas helpi vin, krom se vi respondas al mia mesaĝo.
+chooselanguage= Elektu lingvon de la listo por ŝanĝi ĉi tiun agordon.
+errorLanguage= Mi ne subtenas tiun lingvon aŭ vi tajperaris. La procezo estas nuligita.
+directionsInit= %s troviĝas je %s for de %s, kaj necesas %s por alveni tien, sekvante tiun veturinstrukcion\:\n
+directionsNotFound= Veturinstrukcio inter %s kaj %s ne estas trovita.
+errorFetchingDirections= Mi bedaŭras, eraro okazis dum ricevado de la veturinstrukcio.
+directionsStep= %s dum %s (%s)
+languageModified= Via lingvo-agordo estas ĝisdatigita.
+
+
+helpWeatherMessage= Suno aŭ pluvo, hajlo aŭ glacio? Ĉu vi volas scii?\nDemandu al mi kaj mi donos la scion al vi\!\n\t\t%s Ricevu la nunan veteron de loko aŭ urbo\n\t\t%s Ricevu prognozon por 3 tagoj de loko aŭ urbo\n\t\t%s Ŝanĝu nunajn avertojn\n\t\t%s Elektu lingvon por prognozoj\n\t\t%s Elektu viajn preferitajn unuojn
+forecast=%sPrognozo
+current=%sNuna
+help=%sHelpo
+settings=%sAgordoj
+cancel=%sNuligi
+location=%sLoko
+new=%sNova
+languages=%sLingvoj
+alerts=%sAvertoj
+units=%sUnuoj
+back=%sReen
+delete=%sForigi
+showList=%sMontri liston
+rateMe=%sKlasifiku min
+metricSystem=Metra sistemo
+imperialSystem= Imperia sistemo
+selectLanguage=Via nuna lingvo estas %sn. Elektu lingvon de la listo por ŝanĝi ĉi tiun agordon.
+languageUpdated=Via lingvo-agordo estas ĝisdatigita.
+errorLanguageNotFound= Mi ne subtenas tiun lingvon aŭ vi tajperaris. Elektu alian el la listo.
+selectUnits=Viaj nunaj unuoj estas %s. Elektu unuojn de la listo por ŝanĝi ĉi tiun agordon.
+unitsUpdated=Via unuo-agordo estas ĝisdatigita.
+errorUnitsNotFound= Mi ne subtenas tiujn unuojn aŭ vi tajperaris. Elektu unu de la listo.
+onWeatherNewCommand=Sendu al mi la urbon, kiu vin interesas. Uzu la jenan formaton\: URBO,LANDO
+onWeatherLocationCommand=Sendu al mi la lokon, kiu vin interesas.
+onCurrentCommandFromHistory=Elektu opcion de viaj lastaj petoj, "nova" por sendi novan urbon aŭ "loko" por sendi al mi lokon por ricevi la nunan veteron.
+onCurrentCommandWithoutHistory=Elektu "nova" por sendi novan urbon aŭ "loko" por sendi al mi lokon por ricevi la nunan veteron.
+onForecastCommandFromHistory=Elektu opcion de viaj lastaj petoj, "nova" por sendi novan urbon aŭ "loko" por sendi al mi lokon por ricevi prognozon por 3 tagoj.
+onForecastCommandWithoutHistory=Elektu "nova" por sendi novan urbon aŭ "loko" por sendi al mi lokon por ricevi prognozon por 3 tagoj.
+weatherCurrent= La vetero por %s estas\:\n\n %s
+currentWeatherPartMetric=\t- Vetero\: %s\n\t- Nubeco\: %s\n\t- Temperaturo\: %s ºC\n
+currentWeatherPartImperial=\t- Vetero\: %s\n\t- Nubeco\: %s\n\t- Temperaturo\: %s ºF\n
+weatherForcast= La vetero por %s estos\:\n\n %s
+forecastWeatherPartMetric=  %s je %s \n\t- Prognozo\: %s\n\t- Alta temperaturo\: %s ºC\n\t- Malalta temperaturo\: %s ºC\n
+forecastWeatherPartImperial=  %s je %s \n\t- Prognozo\: %s\n\t- Alta temperaturo\: %s ºF\n\t- Malalta temperaturo\: %s ºF\n
+weatherAlert= La vetero por %s estos\:\n\n %s
+alertWeatherPartMetric=\t- Prognozo\: %s\n\t- Alta temperaturo\: %s ºC\n\t- Malalta temperaturo\: %s ºC\n
+alertWeatherPartImperial=\t- Prognozo\: %s\n\t- Alta temperaturo\: %s ºF\n\t- Malalta temperaturo\: %s ºF\n
+chooseOption=Elektu opcion de la menuo.
+backToMainMenu=Procezo estas nuligita, reen al la ĉefa menuo.
+onSettingsCommand=Elektu opcion\:\n\t\t%s Lingvoj\: Elektu lingvon por prognozoj\n\t\t%s Unuoj\: Elektu viajn preferitajn unuojn\n\t\t%s Avertoj\: Ŝanĝu tagajn avertojn\n\t\t%s Reen\: Reen al la ĉefa menuo
+alertsMenuMessage=Ĉi tie vi povas administri viajn avertojn aŭ aldoni novajn avertojn.
+chooseNewAlertCity=Por kiu urbo vi volas agordi averton? Elektu opcion de viaj lastaj petoj.
+newAlertSaved=%s Via averto por %s estas kreita ĝuste, vi ricevos la veteron dufoje tage.
+initialAlertList=Vi havas %d avertojn\:\n\n%s
+partialAlertList=%s%s\n
+noAlertList=Mi ne povas trovi ajnan averton por vi.
+alertDeleted=La elektita averto estas forigita.
+cityNotFound= Urbo ne estas trovita
+errorFetchingWeather= Mi bedaŭras, eraro okazis dum ricevado de la vetero.
+rateMeMessage=Se vi ŝatas ĉi tiun roboton, bonvolu klasifikadi ĝin ĉe https\://telegram.me/storebot?start\=weatherbot

From 28b94de71e736c8f1cb11b69ff0424062ea767d5 Mon Sep 17 00:00:00 2001
From: Rubenlagu <rberlopez@gmail.com>
Date: Thu, 12 Nov 2015 00:27:59 +0100
Subject: [PATCH 04/10] 1. fix esperanto

---
 src/main/resources/localisation/strings_eo.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/localisation/strings_eo.properties b/src/main/resources/localisation/strings_eo.properties
index dcdc896..1fc3254 100644
--- a/src/main/resources/localisation/strings_eo.properties
+++ b/src/main/resources/localisation/strings_eo.properties
@@ -39,7 +39,7 @@ showList=%sMontri liston
 rateMe=%sKlasifiku min
 metricSystem=Metra sistemo
 imperialSystem= Imperia sistemo
-selectLanguage=Via nuna lingvo estas %sn. Elektu lingvon de la listo por ŝanĝi ĉi tiun agordon.
+selectLanguage=Via nuna lingvo estas %s. Elektu lingvon de la listo por ŝanĝi ĉi tiun agordon.
 languageUpdated=Via lingvo-agordo estas ĝisdatigita.
 errorLanguageNotFound= Mi ne subtenas tiun lingvon aŭ vi tajperaris. Elektu alian el la listo.
 selectUnits=Viaj nunaj unuoj estas %s. Elektu unuojn de la listo por ŝanĝi ĉi tiun agordon.

From fb6e86af3c99812e013dd3e3162947d4c0f14049 Mon Sep 17 00:00:00 2001
From: Rubenlagu <rberlopez@gmail.com>
Date: Thu, 12 Nov 2015 00:31:35 +0100
Subject: [PATCH 05/10] 1. Fix possible flood hit

---
 .../org/telegram/updateshandlers/WeatherHandlers.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
index dcec189..d30480b 100644
--- a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
+++ b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
@@ -4,10 +4,10 @@ import org.telegram.BotConfig;
 import org.telegram.BuildVars;
 import org.telegram.Commands;
 import org.telegram.SenderHelper;
-import org.telegram.api.objects.*;
-import org.telegram.database.DatabaseManager;
 import org.telegram.api.methods.BotApiMethod;
 import org.telegram.api.methods.SendMessage;
+import org.telegram.api.objects.*;
+import org.telegram.database.DatabaseManager;
 import org.telegram.services.*;
 import org.telegram.structure.WeatherAlert;
 import org.telegram.updatesreceivers.UpdatesThread;
@@ -77,6 +77,13 @@ public class WeatherHandlers implements UpdatesCallback {
     private static void sendAlerts() {
         List<WeatherAlert> allAlerts = DatabaseManager.getInstance().getAllAlerts();
         for (WeatherAlert weatherAlert : allAlerts) {
+            synchronized (Thread.currentThread()) {
+                try {
+                    Thread.currentThread().wait(35);
+                } catch (InterruptedException e) {
+                    BotLogger.severe(LOGTAG, e);
+                }
+            }
             String[] userOptions = DatabaseManager.getInstance().getUserWeatherOptions(weatherAlert.getUserId());
             String weather = WeatherService.getInstance().fetchWeatherAlert(weatherAlert.getCityId(),
                     weatherAlert.getUserId(), userOptions[0], userOptions[1]);

From b87191ccc9b6401de48b35c42590506ea11f299a Mon Sep 17 00:00:00 2001
From: dapoldi <dapoldi@hotmail.com>
Date: Sun, 15 Nov 2015 18:51:04 +0100
Subject: [PATCH 06/10] converted to UTF8

---
 .../localisation/strings_eo.properties        | 78 +++++++++----------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/main/resources/localisation/strings_eo.properties b/src/main/resources/localisation/strings_eo.properties
index 1fc3254..f1428ca 100644
--- a/src/main/resources/localisation/strings_eo.properties
+++ b/src/main/resources/localisation/strings_eo.properties
@@ -1,28 +1,28 @@
-helpTransifex= Ĉu vi estas suferanto de babela eraro? Provu min por Telegram-tradukaro.\n\nPor ricevi la plej lastatempan Telegram-tradukdosieron por lingvo\: \n|-- %s LINGVOKODO \: Ricevi la plej lastatempan iOS-tradukon.\n|-- %s LINGVOKODO \: Ricevi la plej lastatempan Android-tradukon.\n|-- %s LINGVOKODO \: Ricevi la plej lastatempan Webogram-tradukon.\n|-- %s LINGVOKODO \: Ricevi la plej lastatempan Tdesktop-tradukon.\n|-- %s LINGVOKODO \: Ricevi la plej lastatempan OSX-App-tradukon.\n|-- %s LINGVOKODO \: Ricevi la plej lastatempan Windows Phone-tradukon.\n\n2. Por ricevi ĝisdatigitan tradukdosieron por via Android-beta-aplikaĵo\: \n|-- %s LINGVOKODO \: Ricevi la plej lastatempan Android-beta-tradukon.\n\n(La lingvokodo de Esperanto estas\: eo)
-helpFiles= Ĉu vi volas konigi dosieron al piratoj? Bonvolu resti ĉi tie kun viaj boatoj\!\n\nKonigi dosierojn per ligilo\: \n|-- %s DOSIERIDENTIGILO \: Ricevi dosieron per identigilo.\n|-- %s \: Komenci dosieralŝuton.\n|-- %s \: Elekti unu de viaj dosieroj por forigi ĝin.\n|-- %s \: Montri liston de viaj alŝutitaj dosieroj.
-helpDirections= Se mapon mi havus, mi bone vojaĝus.\n\nPor ricevi veturinstrukcion inter du lokoj\: \n|-- %s \: Komenci ricevi veturinstrukcion
-sendFileToUpload= Sendu al mi dosieron kiun vi volas konigi. Certu, ke vi aligos ĝin kiel dosieron, ne kiel bildon aŭ videon.
-fileUploaded= Bone, via dosiero estas alŝutita. Sendu tiun ligilon al ĉiuj ajn, kiujn vi volas kaj ili povos elŝuti la dosieron\:\n
+helpTransifex= \u0108u vi estas suferanto de babela eraro? Provu min por Telegram-tradukaro.\n\nPor ricevi la plej lastatempan Telegram-tradukdosieron por lingvo\: \n|-- %s LINGVOKODO \: Ricevi la plej lastatempan iOS-tradukon.\n|-- %s LINGVOKODO \: Ricevi la plej lastatempan Android-tradukon.\n|-- %s LINGVOKODO \: Ricevi la plej lastatempan Webogram-tradukon.\n|-- %s LINGVOKODO \: Ricevi la plej lastatempan Tdesktop-tradukon.\n|-- %s LINGVOKODO \: Ricevi la plej lastatempan OSX-App-tradukon.\n|-- %s LINGVOKODO \: Ricevi la plej lastatempan Windows Phone-tradukon.\n\n2. Por ricevi \u011disdatigitan tradukdosieron por via Android-beta-aplika\u0135o\: \n|-- %s LINGVOKODO \: Ricevi la plej lastatempan Android-beta-tradukon.\n\n(La lingvokodo de Esperanto estas\: eo)
+helpFiles= \u0108u vi volas konigi dosieron al piratoj? Bonvolu resti \u0109i tie kun viaj boatoj\!\n\nKonigi dosierojn per ligilo\: \n|-- %s DOSIERIDENTIGILO \: Ricevi dosieron per identigilo.\n|-- %s \: Komenci dosieral\u015duton.\n|-- %s \: Elekti unu de viaj dosieroj por forigi \u011din.\n|-- %s \: Montri liston de viaj al\u015dutitaj dosieroj.
+helpDirections= Se mapon mi havus, mi bone voja\u011dus.\n\nPor ricevi veturinstrukcion inter du lokoj\: \n|-- %s \: Komenci ricevi veturinstrukcion
+sendFileToUpload= Sendu al mi dosieron kiun vi volas konigi. Certu, ke vi aligos \u011din kiel dosieron, ne kiel bildon a\u016d videon.
+fileUploaded= Bone, via dosiero estas al\u015dutita. Sendu tiun ligilon al \u0109iuj ajn, kiujn vi volas kaj ili povos el\u015duti la dosieron\:\n
 deleteUploadedFile= Elektu la dosieron, kiun vi volas forigi\:
 fileDeleted= La dosiero estis forigita
-wrongFileId= Mi bedaŭras, mi ne povas trovi dosieron per tiu identigilo. Aŭ vi tajperaris aŭ ĝi estis forigita jam.
-listOfFiles= Jen viaj nunaj alŝutitaj dosieroj\:
-noFiles= Vi ne havas ajnajn alŝutitajn dosierojn ankoraŭ.
+wrongFileId= Mi beda\u016dras, mi ne povas trovi dosieron per tiu identigilo. A\u016d vi tajperaris a\u016d \u011di estis forigita jam.
+listOfFiles= Jen viaj nunaj al\u015dutitaj dosieroj\:
+noFiles= Vi ne havas ajnajn al\u015dutitajn dosierojn ankora\u016d.
 processFinished= La nuna procezo estas nuligita.
 uploadedFileURL= https\://telegram.me/filesbot?start\=
-initDirections= Respondu al tiu mesaĝo per via deirpunkto.
-sendDestination= Respondu al tiu mesaĝo per via destino.
-youNeedReplyDirections= Mi bedaŭras, mi ne povas helpi vin, krom se vi respondas al mia mesaĝo.
-chooselanguage= Elektu lingvon de la listo por ŝanĝi ĉi tiun agordon.
-errorLanguage= Mi ne subtenas tiun lingvon aŭ vi tajperaris. La procezo estas nuligita.
-directionsInit= %s troviĝas je %s for de %s, kaj necesas %s por alveni tien, sekvante tiun veturinstrukcion\:\n
+initDirections= Respondu al tiu mesa\u011do per via deirpunkto.
+sendDestination= Respondu al tiu mesa\u011do per via destino.
+youNeedReplyDirections= Mi beda\u016dras, mi ne povas helpi vin, krom se vi respondas al mia mesa\u011do.
+chooselanguage= Elektu lingvon de la listo por \u015dan\u011di \u0109i tiun agordon.
+errorLanguage= Mi ne subtenas tiun lingvon a\u016d vi tajperaris. La procezo estas nuligita.
+directionsInit= %s trovi\u011das je %s for de %s, kaj necesas %s por alveni tien, sekvante tiun veturinstrukcion\:\n
 directionsNotFound= Veturinstrukcio inter %s kaj %s ne estas trovita.
-errorFetchingDirections= Mi bedaŭras, eraro okazis dum ricevado de la veturinstrukcio.
+errorFetchingDirections= Mi beda\u016dras, eraro okazis dum ricevado de la veturinstrukcio.
 directionsStep= %s dum %s (%s)
-languageModified= Via lingvo-agordo estas ĝisdatigita.
+languageModified= Via lingvo-agordo estas \u011disdatigita.
 
 
-helpWeatherMessage= Suno aŭ pluvo, hajlo aŭ glacio? Ĉu vi volas scii?\nDemandu al mi kaj mi donos la scion al vi\!\n\t\t%s Ricevu la nunan veteron de loko aŭ urbo\n\t\t%s Ricevu prognozon por 3 tagoj de loko aŭ urbo\n\t\t%s Ŝanĝu nunajn avertojn\n\t\t%s Elektu lingvon por prognozoj\n\t\t%s Elektu viajn preferitajn unuojn
+helpWeatherMessage= Suno a\u016d pluvo, hajlo a\u016d glacio? \u0108u vi volas scii?\nDemandu al mi kaj mi donos la scion al vi\!\n\t\t%s Ricevu la nunan veteron de loko a\u016d urbo\n\t\t%s Ricevu prognozon por 3 tagoj de loko a\u016d urbo\n\t\t%s \u015can\u011du nunajn avertojn\n\t\t%s Elektu lingvon por prognozoj\n\t\t%s Elektu viajn preferitajn unuojn
 forecast=%sPrognozo
 current=%sNuna
 help=%sHelpo
@@ -39,37 +39,37 @@ showList=%sMontri liston
 rateMe=%sKlasifiku min
 metricSystem=Metra sistemo
 imperialSystem= Imperia sistemo
-selectLanguage=Via nuna lingvo estas %s. Elektu lingvon de la listo por ŝanĝi ĉi tiun agordon.
-languageUpdated=Via lingvo-agordo estas ĝisdatigita.
-errorLanguageNotFound= Mi ne subtenas tiun lingvon aŭ vi tajperaris. Elektu alian el la listo.
-selectUnits=Viaj nunaj unuoj estas %s. Elektu unuojn de la listo por ŝanĝi ĉi tiun agordon.
-unitsUpdated=Via unuo-agordo estas ĝisdatigita.
-errorUnitsNotFound= Mi ne subtenas tiujn unuojn aŭ vi tajperaris. Elektu unu de la listo.
+selectLanguage=Via nuna lingvo estas %s. Elektu lingvon de la listo por \u015dan\u011di \u0109i tiun agordon.
+languageUpdated=Via lingvo-agordo estas \u011disdatigita.
+errorLanguageNotFound= Mi ne subtenas tiun lingvon a\u016d vi tajperaris. Elektu alian el la listo.
+selectUnits=Viaj nunaj unuoj estas %s. Elektu unuojn de la listo por \u015dan\u011di \u0109i tiun agordon.
+unitsUpdated=Via unuo-agordo estas \u011disdatigita.
+errorUnitsNotFound= Mi ne subtenas tiujn unuojn a\u016d vi tajperaris. Elektu unu de la listo.
 onWeatherNewCommand=Sendu al mi la urbon, kiu vin interesas. Uzu la jenan formaton\: URBO,LANDO
 onWeatherLocationCommand=Sendu al mi la lokon, kiu vin interesas.
-onCurrentCommandFromHistory=Elektu opcion de viaj lastaj petoj, "nova" por sendi novan urbon aŭ "loko" por sendi al mi lokon por ricevi la nunan veteron.
-onCurrentCommandWithoutHistory=Elektu "nova" por sendi novan urbon aŭ "loko" por sendi al mi lokon por ricevi la nunan veteron.
-onForecastCommandFromHistory=Elektu opcion de viaj lastaj petoj, "nova" por sendi novan urbon aŭ "loko" por sendi al mi lokon por ricevi prognozon por 3 tagoj.
-onForecastCommandWithoutHistory=Elektu "nova" por sendi novan urbon aŭ "loko" por sendi al mi lokon por ricevi prognozon por 3 tagoj.
+onCurrentCommandFromHistory=Elektu opcion de viaj lastaj petoj, "nova" por sendi novan urbon a\u016d "loko" por sendi al mi lokon por ricevi la nunan veteron.
+onCurrentCommandWithoutHistory=Elektu "nova" por sendi novan urbon a\u016d "loko" por sendi al mi lokon por ricevi la nunan veteron.
+onForecastCommandFromHistory=Elektu opcion de viaj lastaj petoj, "nova" por sendi novan urbon a\u016d "loko" por sendi al mi lokon por ricevi prognozon por 3 tagoj.
+onForecastCommandWithoutHistory=Elektu "nova" por sendi novan urbon a\u016d "loko" por sendi al mi lokon por ricevi prognozon por 3 tagoj.
 weatherCurrent= La vetero por %s estas\:\n\n %s
-currentWeatherPartMetric=\t- Vetero\: %s\n\t- Nubeco\: %s\n\t- Temperaturo\: %s ºC\n
-currentWeatherPartImperial=\t- Vetero\: %s\n\t- Nubeco\: %s\n\t- Temperaturo\: %s ºF\n
+currentWeatherPartMetric=\t- Vetero\: %s\n\t- Nubeco\: %s\n\t- Temperaturo\: %s \u00baC\n
+currentWeatherPartImperial=\t- Vetero\: %s\n\t- Nubeco\: %s\n\t- Temperaturo\: %s \u00baF\n
 weatherForcast= La vetero por %s estos\:\n\n %s
-forecastWeatherPartMetric=  %s je %s \n\t- Prognozo\: %s\n\t- Alta temperaturo\: %s ºC\n\t- Malalta temperaturo\: %s ºC\n
-forecastWeatherPartImperial=  %s je %s \n\t- Prognozo\: %s\n\t- Alta temperaturo\: %s ºF\n\t- Malalta temperaturo\: %s ºF\n
+forecastWeatherPartMetric=  %s je %s \n\t- Prognozo\: %s\n\t- Alta temperaturo\: %s \u00baC\n\t- Malalta temperaturo\: %s \u00baC\n
+forecastWeatherPartImperial=  %s je %s \n\t- Prognozo\: %s\n\t- Alta temperaturo\: %s \u00baF\n\t- Malalta temperaturo\: %s \u00baF\n
 weatherAlert= La vetero por %s estos\:\n\n %s
-alertWeatherPartMetric=\t- Prognozo\: %s\n\t- Alta temperaturo\: %s ºC\n\t- Malalta temperaturo\: %s ºC\n
-alertWeatherPartImperial=\t- Prognozo\: %s\n\t- Alta temperaturo\: %s ºF\n\t- Malalta temperaturo\: %s ºF\n
+alertWeatherPartMetric=\t- Prognozo\: %s\n\t- Alta temperaturo\: %s \u00baC\n\t- Malalta temperaturo\: %s \u00baC\n
+alertWeatherPartImperial=\t- Prognozo\: %s\n\t- Alta temperaturo\: %s \u00baF\n\t- Malalta temperaturo\: %s \u00baF\n
 chooseOption=Elektu opcion de la menuo.
-backToMainMenu=Procezo estas nuligita, reen al la ĉefa menuo.
-onSettingsCommand=Elektu opcion\:\n\t\t%s Lingvoj\: Elektu lingvon por prognozoj\n\t\t%s Unuoj\: Elektu viajn preferitajn unuojn\n\t\t%s Avertoj\: Ŝanĝu tagajn avertojn\n\t\t%s Reen\: Reen al la ĉefa menuo
-alertsMenuMessage=Ĉi tie vi povas administri viajn avertojn aŭ aldoni novajn avertojn.
+backToMainMenu=Procezo estas nuligita, reen al la \u0109efa menuo.
+onSettingsCommand=Elektu opcion\:\n\t\t%s Lingvoj\: Elektu lingvon por prognozoj\n\t\t%s Unuoj\: Elektu viajn preferitajn unuojn\n\t\t%s Avertoj\: \u015can\u011du tagajn avertojn\n\t\t%s Reen\: Reen al la \u0109efa menuo
+alertsMenuMessage=\u0108i tie vi povas administri viajn avertojn a\u016d aldoni novajn avertojn.
 chooseNewAlertCity=Por kiu urbo vi volas agordi averton? Elektu opcion de viaj lastaj petoj.
-newAlertSaved=%s Via averto por %s estas kreita ĝuste, vi ricevos la veteron dufoje tage.
+newAlertSaved=%s Via averto por %s estas kreita \u011duste, vi ricevos la veteron dufoje tage.
 initialAlertList=Vi havas %d avertojn\:\n\n%s
 partialAlertList=%s%s\n
 noAlertList=Mi ne povas trovi ajnan averton por vi.
 alertDeleted=La elektita averto estas forigita.
 cityNotFound= Urbo ne estas trovita
-errorFetchingWeather= Mi bedaŭras, eraro okazis dum ricevado de la vetero.
-rateMeMessage=Se vi ŝatas ĉi tiun roboton, bonvolu klasifikadi ĝin ĉe https\://telegram.me/storebot?start\=weatherbot
+errorFetchingWeather= Mi beda\u016dras, eraro okazis dum ricevado de la vetero.
+rateMeMessage=Se vi \u015datas \u0109i tiun roboton, bonvolu klasifikadi \u011din \u0109e https\://telegram.me/storebot?start\=weatherbot

From a25493b29414e0e899d8e02b5996237a78bc50ab Mon Sep 17 00:00:00 2001
From: Rubenlagu <rberlopez@gmail.com>
Date: Thu, 19 Nov 2015 22:17:15 +0100
Subject: [PATCH 07/10] 1. Improved support for channels

---
 src/main/java/org/telegram/SenderHelper.java  | 11 ++-----
 .../telegram/api/methods/SendDocument.java    | 15 ++--------
 .../java/org/telegram/api/objects/Chat.java   |  6 ++--
 .../org/telegram/api/objects/Message.java     |  2 +-
 .../telegram/database/CreationStrings.java    |  4 +--
 .../telegram/database/DatabaseManager.java    | 18 +++++++----
 .../updateshandlers/FilesHandlers.java        |  8 ++---
 .../updateshandlers/TransifexHandlers.java    | 13 ++++----
 .../updateshandlers/WeatherHandlers.java      | 30 +++++++++----------
 9 files changed, 51 insertions(+), 56 deletions(-)

diff --git a/src/main/java/org/telegram/SenderHelper.java b/src/main/java/org/telegram/SenderHelper.java
index f65eb8b..06972de 100644
--- a/src/main/java/org/telegram/SenderHelper.java
+++ b/src/main/java/org/telegram/SenderHelper.java
@@ -16,7 +16,6 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 import org.json.JSONObject;
-import org.telegram.api.objects.Message;
 import org.telegram.api.methods.*;
 import org.telegram.services.BotLogger;
 import org.telegram.updateshandlers.SentCallback;
@@ -24,10 +23,8 @@ import org.telegram.updateshandlers.SentCallback;
 import java.io.File;
 import java.io.IOException;
 import java.io.InvalidObjectException;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -49,11 +46,7 @@ public class SenderHelper {
 
             if (sendDocument.isNewDocument()) {
                 MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-                if (sendDocument.getChatId() == null) {
-                    builder.addTextBody(SendDocument.CHATID_FIELD, sendDocument.getChannelId());
-                } else {
-                    builder.addTextBody(SendDocument.CHATID_FIELD, sendDocument.getChatId().toString());
-                }
+                builder.addTextBody(SendDocument.CHATID_FIELD, sendDocument.getChatId());
                 builder.addBinaryBody(SendDocument.DOCUMENT_FIELD, new File(sendDocument.getDocument()), ContentType.APPLICATION_OCTET_STREAM, sendDocument.getDocumentName());
                 if (sendDocument.getReplayMarkup() != null) {
                     builder.addTextBody(SendDocument.REPLYMARKUP_FIELD, sendDocument.getReplayMarkup().toJson().toString());
@@ -65,7 +58,7 @@ public class SenderHelper {
                 httppost.setEntity(multipart);
             } else {
                 List<NameValuePair> nameValuePairs = new ArrayList<>();
-                nameValuePairs.add(new BasicNameValuePair(SendDocument.CHATID_FIELD, sendDocument.getChatId().toString()));
+                nameValuePairs.add(new BasicNameValuePair(SendDocument.CHATID_FIELD, sendDocument.getChatId()));
                 nameValuePairs.add(new BasicNameValuePair(SendDocument.DOCUMENT_FIELD, sendDocument.getDocument()));
                 if (sendDocument.getReplayMarkup() != null) {
                     nameValuePairs.add(new BasicNameValuePair(SendDocument.REPLYMARKUP_FIELD, sendDocument.getReplayMarkup().toString()));
diff --git a/src/main/java/org/telegram/api/methods/SendDocument.java b/src/main/java/org/telegram/api/methods/SendDocument.java
index a106ecb..0345d66 100644
--- a/src/main/java/org/telegram/api/methods/SendDocument.java
+++ b/src/main/java/org/telegram/api/methods/SendDocument.java
@@ -12,8 +12,7 @@ public class SendDocument {
     public static final String PATH = "senddocument";
 
     public static final String CHATID_FIELD = "chat_id";
-    private Integer chatId; ///< Unique identifier for the chat to send the message to
-    private String channelId; ///< Username for the channel to send the message to
+    private String chatId; ///< Unique identifier for the chat to send the message to or Username for the channel to send the message to
     public static final String DOCUMENT_FIELD = "document";
     private String document; ///< File file to send. file_id as String to resend a file that is already on the Telegram servers
     public static final String REPLYTOMESSAGEID_FIELD = "reply_to_message_id";
@@ -28,22 +27,14 @@ public class SendDocument {
         super();
     }
 
-    public Integer getChatId() {
+    public String getChatId() {
         return chatId;
     }
 
-    public void setChatId(Integer chatId) {
+    public void setChatId(String chatId) {
         this.chatId = chatId;
     }
 
-    public void setChatId(String channelId) {
-        this.channelId = channelId;
-    }
-
-    public String getChannelId() {
-        return channelId;
-    }
-
     public String getDocument() {
         return document;
     }
diff --git a/src/main/java/org/telegram/api/objects/Chat.java b/src/main/java/org/telegram/api/objects/Chat.java
index c718c03..c797a58 100644
--- a/src/main/java/org/telegram/api/objects/Chat.java
+++ b/src/main/java/org/telegram/api/objects/Chat.java
@@ -22,7 +22,7 @@ public class Chat implements BotApiObject {
 
     public static final String ID_FIELD = "id";
     @JsonProperty(ID_FIELD)
-    private Integer id; ///< Unique identifier for this chat, not exciding 1e13 by absolute value
+    private Long id; ///< Unique identifier for this chat, not exciding 1e13 by absolute value
     public static final String TYPE_FIELD = "type";
     @JsonProperty(TYPE_FIELD)
     private String type; ///< Type of the chat, one of “private”, “group” or “channel”
@@ -45,7 +45,7 @@ public class Chat implements BotApiObject {
 
     public Chat(JSONObject jsonObject) {
         super();
-        this.id = jsonObject.getInt(ID_FIELD);
+        this.id = jsonObject.getLong(ID_FIELD);
         this.type = jsonObject.getString(TYPE_FIELD);
         if (jsonObject.has(TITLE_FIELD)) {
             this.title = jsonObject.getString(TITLE_FIELD);
@@ -61,7 +61,7 @@ public class Chat implements BotApiObject {
         }
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
diff --git a/src/main/java/org/telegram/api/objects/Message.java b/src/main/java/org/telegram/api/objects/Message.java
index 7702c95..d3fc531 100644
--- a/src/main/java/org/telegram/api/objects/Message.java
+++ b/src/main/java/org/telegram/api/objects/Message.java
@@ -198,7 +198,7 @@ public class Message implements BotApiObject {
         return chat.isChannelChat();
     }
 
-    public Integer getChatId() {
+    public Long getChatId() {
         return chat.getId();
     }
 
diff --git a/src/main/java/org/telegram/database/CreationStrings.java b/src/main/java/org/telegram/database/CreationStrings.java
index 59a2fb5..8b56782 100644
--- a/src/main/java/org/telegram/database/CreationStrings.java
+++ b/src/main/java/org/telegram/database/CreationStrings.java
@@ -7,7 +7,7 @@ package org.telegram.database;
  * @date 15 of May of 2015
  */
 public class CreationStrings {
-    public static final int version = 6;
+    public static final int version = 7;
     public static final String createVersionTable = "CREATE TABLE IF NOT EXISTS Versions(ID INTEGER PRIMARY KEY AUTO_INCREMENT, Version INTEGER);";
     public static final String insertCurrentVersion = "INSERT IGNORE INTO Versions (Version) VALUES(%d);";
     public static final String createFilesTable = "CREATE TABLE IF NOT EXISTS Files (fileId VARCHAR(100) PRIMARY KEY, userId INTEGER NOT NULL, caption TEXT NOT NULL)";
@@ -21,7 +21,7 @@ public class CreationStrings {
     public static final String createUserLanguageDatabase = "CREATE TABLE IF NOT EXISTS UserLanguage (userId INTEGER PRIMARY KEY, languageCode VARCHAR(10) NOT NULL)";
     public static final String createUserWeatherOptionDatabase = "CREATE TABLE IF NOT EXISTS UserWeatherOptions (userId INTEGER PRIMARY KEY, languageCode VARCHAR(10) NOT NULL DEFAULT 'en', " +
             "units VARCHAR(10) NOT NULL DEFAULT 'metric')";
-    public static final String createWeatherStateTable = "CREATE TABLE IF NOT EXISTS WeatherState (userId INTEGER NOT NULL, chatId INTEGER NOT NULL, state INTEGER NOT NULL DEFAULT 0, " +
+    public static final String createWeatherStateTable = "CREATE TABLE IF NOT EXISTS WeatherState (userId INTEGER NOT NULL, chatId BIGINT NOT NULL, state INTEGER NOT NULL DEFAULT 0, " +
             "languageCode VARCHAR(10) NOT NULL DEFAULT 'en', " +
             "CONSTRAINT `watherPrimaryKey` PRIMARY KEY(userId,chatId));";
     public static final String createWeatherAlertTable = "CREATE TABLE IF NOT EXISTS WeatherAlert (id INTEGER PRIMARY KEY AUTO_INCREMENT, userId INTEGER NOT NULL, cityId INTEGER NOT NULL, " +
diff --git a/src/main/java/org/telegram/database/DatabaseManager.java b/src/main/java/org/telegram/database/DatabaseManager.java
index 295ee25..861ed4c 100644
--- a/src/main/java/org/telegram/database/DatabaseManager.java
+++ b/src/main/java/org/telegram/database/DatabaseManager.java
@@ -9,7 +9,6 @@ package org.telegram.database;
 
 import org.telegram.services.BotLogger;
 import org.telegram.structure.WeatherAlert;
-import org.telegram.updateshandlers.WeatherHandlers;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -87,6 +86,9 @@ public class DatabaseManager {
             if (currentVersion == 5) {
                 currentVersion = updateToVersion6();
             }
+            if (currentVersion == 6) {
+                currentVersion = updateToVersion7();
+            }
             connetion.commitTransaction();
         } catch (SQLException e) {
             BotLogger.error(LOGTAG, e);
@@ -125,6 +127,12 @@ public class DatabaseManager {
         return 6;
     }
 
+    private int updateToVersion7() throws SQLException {
+        connetion.executeQuery("ALTER TABLE WeatherState MODIFY chatId BIGINT NOT NULL");
+        connetion.executeQuery(String.format(CreationStrings.insertCurrentVersion, 7));
+        return 7;
+    }
+
     private int createNewTables() throws SQLException {
         connetion.executeQuery(CreationStrings.createVersionTable);
         connetion.executeQuery(CreationStrings.createFilesTable);
@@ -412,12 +420,12 @@ public class DatabaseManager {
         return updatedRows > 0;
     }
 
-    public int getWeatherState(Integer userId, Integer chatId) {
+    public int getWeatherState(Integer userId, Long chatId) {
         int state = 0;
         try {
             final PreparedStatement preparedStatement = connetion.getPreparedStatement("SELECT state FROM WeatherState WHERE userId = ? AND chatId = ?");
             preparedStatement.setInt(1, userId);
-            preparedStatement.setInt(2, chatId);
+            preparedStatement.setLong(2, chatId);
             final ResultSet result = preparedStatement.executeQuery();
             if (result.next()) {
                 state = result.getInt("state");
@@ -428,12 +436,12 @@ public class DatabaseManager {
         return state;
     }
 
-    public boolean insertWeatherState(Integer userId, Integer chatId, int state) {
+    public boolean insertWeatherState(Integer userId, Long chatId, int state) {
         int updatedRows = 0;
         try {
             final PreparedStatement preparedStatement = connetion.getPreparedStatement("REPLACE INTO WeatherState (userId, chatId, state) VALUES (?, ?, ?)");
             preparedStatement.setInt(1, userId);
-            preparedStatement.setInt(2, chatId);
+            preparedStatement.setLong(2, chatId);
             preparedStatement.setInt(3, state);
             updatedRows = preparedStatement.executeUpdate();
         } catch (SQLException e) {
diff --git a/src/main/java/org/telegram/updateshandlers/FilesHandlers.java b/src/main/java/org/telegram/updateshandlers/FilesHandlers.java
index fce8398..a30a727 100644
--- a/src/main/java/org/telegram/updateshandlers/FilesHandlers.java
+++ b/src/main/java/org/telegram/updateshandlers/FilesHandlers.java
@@ -4,14 +4,14 @@ import org.telegram.BotConfig;
 import org.telegram.BuildVars;
 import org.telegram.Commands;
 import org.telegram.SenderHelper;
+import org.telegram.api.methods.BotApiMethod;
+import org.telegram.api.methods.SendDocument;
+import org.telegram.api.methods.SendMessage;
 import org.telegram.api.objects.Message;
 import org.telegram.api.objects.ReplyKeyboardHide;
 import org.telegram.api.objects.ReplyKeyboardMarkup;
 import org.telegram.api.objects.Update;
 import org.telegram.database.DatabaseManager;
-import org.telegram.api.methods.BotApiMethod;
-import org.telegram.api.methods.SendDocument;
-import org.telegram.api.methods.SendMessage;
 import org.telegram.services.BotLogger;
 import org.telegram.services.Emoji;
 import org.telegram.services.LocalisationService;
@@ -208,7 +208,7 @@ public class FilesHandlers implements UpdatesCallback {
         if (DatabaseManager.getInstance().doesFileExists(part.trim())) {
             SendDocument sendDocumentRequest = new SendDocument();
             sendDocumentRequest.setDocument(part.trim());
-            sendDocumentRequest.setChatId(message.getChatId());
+            sendDocumentRequest.setChatId(message.getChatId().toString());
             SenderHelper.SendDocument(sendDocumentRequest, TOKEN);
         } else {
             SendMessage sendMessageRequest = new SendMessage();
diff --git a/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java b/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java
index 56b3297..fba2bed 100644
--- a/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java
+++ b/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java
@@ -1,12 +1,15 @@
 package org.telegram.updateshandlers;
 
-import org.telegram.*;
-import org.telegram.api.objects.Message;
-import org.telegram.api.objects.Update;
-import org.telegram.database.DatabaseManager;
+import org.telegram.BotConfig;
+import org.telegram.BuildVars;
+import org.telegram.Commands;
+import org.telegram.SenderHelper;
 import org.telegram.api.methods.BotApiMethod;
 import org.telegram.api.methods.SendDocument;
 import org.telegram.api.methods.SendMessage;
+import org.telegram.api.objects.Message;
+import org.telegram.api.objects.Update;
+import org.telegram.database.DatabaseManager;
 import org.telegram.services.BotLogger;
 import org.telegram.services.LocalisationService;
 import org.telegram.services.TransifexService;
@@ -87,7 +90,7 @@ public class TransifexHandlers implements UpdatesCallback {
                 }
 
                 if (sendDocument != null) {
-                    sendDocument.setChatId(message.getChatId());
+                    sendDocument.setChatId(message.getChatId().toString());
                     SenderHelper.SendDocument(sendDocument, TOKEN);
                 }
             } else if (parts[0].startsWith(Commands.help) ||
diff --git a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
index d30480b..b803e40 100644
--- a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
+++ b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
@@ -119,7 +119,7 @@ public class WeatherHandlers implements UpdatesCallback {
         return null;
     }
 
-    private static BotApiMethod onCancelCommand(Integer chatId, Integer userId, Integer messageId, ReplyKeyboard replyKeyboard, String language) {
+    private static BotApiMethod onCancelCommand(Long chatId, Integer userId, Integer messageId, ReplyKeyboard replyKeyboard, String language) {
         SendMessage sendMessage = new SendMessage();
         sendMessage.setChatId(chatId.toString());
         sendMessage.enableMarkdown(true);
@@ -181,7 +181,7 @@ public class WeatherHandlers implements UpdatesCallback {
         return botApiMethod;
     }
 
-    private static void sendHideKeyboard(Integer userId, Integer chatId, Integer messageId) {
+    private static void sendHideKeyboard(Integer userId, Long chatId, Integer messageId) {
         SendMessage sendMessage = new SendMessage();
         sendMessage.setChatId(chatId.toString());
         sendMessage.enableMarkdown(true);
@@ -484,7 +484,7 @@ public class WeatherHandlers implements UpdatesCallback {
         return sendMessage;
     }
 
-    private static BotApiMethod onUnitsError(Integer chatId, Integer messageId, String language) {
+    private static BotApiMethod onUnitsError(Long chatId, Integer messageId, String language) {
         SendMessage sendMessageRequest = new SendMessage();
         sendMessageRequest.enableMarkdown(true);
         sendMessageRequest.setChatId(chatId.toString());
@@ -495,7 +495,7 @@ public class WeatherHandlers implements UpdatesCallback {
         return sendMessageRequest;
     }
 
-    private static BotApiMethod onUnitsChosen(Integer userId, Integer chatId, Integer messageId, String units, String language) {
+    private static BotApiMethod onUnitsChosen(Integer userId, Long chatId, Integer messageId, String units, String language) {
         DatabaseManager.getInstance().putUserWeatherUnitsOption(userId, units);
 
         SendMessage sendMessageRequest = new SendMessage();
@@ -542,7 +542,7 @@ public class WeatherHandlers implements UpdatesCallback {
         return sendMessage;
     }
 
-    private static BotApiMethod onLanguageError(Integer chatId, Integer messageId, String language) {
+    private static BotApiMethod onLanguageError(Long chatId, Integer messageId, String language) {
         SendMessage sendMessageRequest = new SendMessage();
         sendMessageRequest.enableMarkdown(true);
         sendMessageRequest.setChatId(chatId.toString());
@@ -553,7 +553,7 @@ public class WeatherHandlers implements UpdatesCallback {
         return sendMessageRequest;
     }
 
-    private static BotApiMethod onLanguageChosen(Integer userId, Integer chatId, Integer messageId, String language) {
+    private static BotApiMethod onLanguageChosen(Integer userId, Long chatId, Integer messageId, String language) {
         String languageCode = LocalisationService.getInstance().getLanguageCodeByName(language);
         DatabaseManager.getInstance().putUserWeatherLanguageOption(userId, languageCode);
 
@@ -614,7 +614,7 @@ public class WeatherHandlers implements UpdatesCallback {
         }
     }
 
-    private static BotApiMethod onForecastWeatherCityReceived(Integer chatId, Integer userId, Integer messageId, String text, String language) {
+    private static BotApiMethod onForecastWeatherCityReceived(Long chatId, Integer userId, Integer messageId, String text, String language) {
         Integer cityId = DatabaseManager.getInstance().getRecentWeatherIdByCity(userId, text);
         if (cityId != null) {
             String unitsSystem = DatabaseManager.getInstance().getUserWeatherOptions(userId)[1];
@@ -633,7 +633,7 @@ public class WeatherHandlers implements UpdatesCallback {
         }
     }
 
-    private static BotApiMethod onLocationForecastWeatherCommand(Integer chatId, Integer userId, Integer messageId, String language) {
+    private static BotApiMethod onLocationForecastWeatherCommand(Long chatId, Integer userId, Integer messageId, String language) {
         ForceReplyKeyboard forceReplyKeyboard = getForceReply();
 
         SendMessage sendMessage = new SendMessage();
@@ -647,7 +647,7 @@ public class WeatherHandlers implements UpdatesCallback {
         return sendMessage;
     }
 
-    private static BotApiMethod onNewForecastWeatherCommand(Integer chatId, Integer userId, Integer messageId, String language) {
+    private static BotApiMethod onNewForecastWeatherCommand(Long chatId, Integer userId, Integer messageId, String language) {
         ForceReplyKeyboard forceReplyKeyboard = getForceReply();
 
         SendMessage sendMessage = new SendMessage();
@@ -716,7 +716,7 @@ public class WeatherHandlers implements UpdatesCallback {
         }
     }
 
-    private static BotApiMethod onCurrentWeatherCityReceived(Integer chatId, Integer userId, Integer messageId, String text, String language) {
+    private static BotApiMethod onCurrentWeatherCityReceived(Long chatId, Integer userId, Integer messageId, String text, String language) {
         Integer cityId = DatabaseManager.getInstance().getRecentWeatherIdByCity(userId, text);
         if (cityId != null) {
             String unitsSystem = DatabaseManager.getInstance().getUserWeatherOptions(userId)[1];
@@ -734,7 +734,7 @@ public class WeatherHandlers implements UpdatesCallback {
         }
     }
 
-    private static BotApiMethod onLocationCurrentWeatherCommand(Integer chatId, Integer userId, Integer messageId, String language) {
+    private static BotApiMethod onLocationCurrentWeatherCommand(Long chatId, Integer userId, Integer messageId, String language) {
         ForceReplyKeyboard forceReplyKeyboard = getForceReply();
 
         SendMessage sendMessage = new SendMessage();
@@ -748,7 +748,7 @@ public class WeatherHandlers implements UpdatesCallback {
         return sendMessage;
     }
 
-    private static BotApiMethod onNewCurrentWeatherCommand(Integer chatId, Integer userId, Integer messageId, String language) {
+    private static BotApiMethod onNewCurrentWeatherCommand(Long chatId, Integer userId, Integer messageId, String language) {
         ForceReplyKeyboard forceReplyKeyboard = getForceReply();
 
         SendMessage sendMessage = new SendMessage();
@@ -1156,7 +1156,7 @@ public class WeatherHandlers implements UpdatesCallback {
         return sendHelpMessage(message.getChatId().toString(), message.getMessageId(), replyKeyboardMarkup, language);
     }
 
-    private static BotApiMethod sendChooseOptionMessage(Integer chatId, Integer messageId,
+    private static BotApiMethod sendChooseOptionMessage(Long chatId, Integer messageId,
                                                 ReplyKeyboard replyKeyboard, String language) {
         SendMessage sendMessage = new SendMessage();
         sendMessage.enableMarkdown(true);
@@ -1212,7 +1212,7 @@ public class WeatherHandlers implements UpdatesCallback {
         return sendMessageRequest;
     }
 
-    private static BotApiMethod onForecastWeatherReceived(Integer chatId, Integer userId, Integer messageId, String text, String language) {
+    private static BotApiMethod onForecastWeatherReceived(Long chatId, Integer userId, Integer messageId, String text, String language) {
         String unitsSystem = DatabaseManager.getInstance().getUserWeatherOptions(userId)[1];
         String weather = WeatherService.getInstance().fetchWeatherForecast(text, userId, language, unitsSystem);
         SendMessage sendMessageRequest = new SendMessage();
@@ -1241,7 +1241,7 @@ public class WeatherHandlers implements UpdatesCallback {
         return sendMessageRequest;
     }
 
-    private static BotApiMethod onCurrentWeatherReceived(Integer chatId, Integer userId, Integer messageId, String text, String language) {
+    private static BotApiMethod onCurrentWeatherReceived(Long chatId, Integer userId, Integer messageId, String text, String language) {
         String unitsSystem = DatabaseManager.getInstance().getUserWeatherOptions(userId)[1];
         String weather = WeatherService.getInstance().fetchWeatherCurrent(text, userId, language, unitsSystem);
         SendMessage sendMessageRequest = new SendMessage();

From 124747254cfa06cfe77905133c1d33eadf50a1d6 Mon Sep 17 00:00:00 2001
From: Rubenlagu <rberlopez@gmail.com>
Date: Sun, 22 Nov 2015 00:51:36 +0100
Subject: [PATCH 08/10] 1. Super groups support

---
 .idea/workspace.xml                           | 915 ++++++++++++------
 .../telegram/api/methods/ForwardMessage.java  |   8 +-
 .../org/telegram/api/methods/GetFile.java     |   7 +-
 .../java/org/telegram/api/methods/GetMe.java  |   4 +-
 .../api/methods/GetUserProfilePhotos.java     |  11 +-
 .../telegram/api/methods/SendChatAction.java  |   5 +-
 .../telegram/api/methods/SendLocation.java    |  15 +-
 .../org/telegram/api/methods/SendMessage.java |  21 +-
 .../java/org/telegram/api/objects/Audio.java  |  18 +-
 .../java/org/telegram/api/objects/Chat.java   |  26 +-
 .../org/telegram/api/objects/Contact.java     |  12 +-
 .../org/telegram/api/objects/Document.java    |  15 +-
 .../java/org/telegram/api/objects/File.java   |  11 +-
 .../api/objects/ForceReplyKeyboard.java       |   6 +-
 .../org/telegram/api/objects/Location.java    |   6 +-
 .../org/telegram/api/objects/Message.java     | 140 +--
 .../org/telegram/api/objects/PhotoSize.java   |  10 +-
 .../api/objects/ReplyKeyboardHide.java        |   6 +-
 .../api/objects/ReplyKeyboardMarkup.java      |  22 +-
 .../org/telegram/api/objects/Sticker.java     |  13 +-
 .../java/org/telegram/api/objects/Update.java |   8 +-
 .../java/org/telegram/api/objects/User.java   |  12 +-
 .../api/objects/UserProfilePhotos.java        |  16 +-
 .../java/org/telegram/api/objects/Video.java  |  17 +-
 .../java/org/telegram/api/objects/Voice.java  |  12 +-
 25 files changed, 709 insertions(+), 627 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 61f4b0f..c9ebe40 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,35 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="cc3252dd-ba1f-404e-b603-ef880b5c3341" name="Default" comment="1. Webhooks&#10;">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/resourceBundles.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/resources/localisation/strings_eo.properties" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dataSources.xml" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/services/LocalisationService.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/services/LocalisationService.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/ForwardMessage.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/ForwardMessage.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetFile.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetFile.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetMe.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetMe.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetUserProfilePhotos.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetUserProfilePhotos.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendChatAction.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendChatAction.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendLocation.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendLocation.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendMessage.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendMessage.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Audio.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Audio.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Chat.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Chat.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Contact.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Contact.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Document.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Document.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/File.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/File.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ForceReplyKeyboard.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ForceReplyKeyboard.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Location.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Location.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/PhotoSize.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/PhotoSize.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ReplyKeyboardHide.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ReplyKeyboardHide.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ReplyKeyboardMarkup.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ReplyKeyboardMarkup.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Sticker.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Sticker.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Update.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Update.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/User.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/User.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/UserProfilePhotos.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/UserProfilePhotos.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Video.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Video.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Voice.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Voice.java" />
     </list>
     <ignored path="BotAPi.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -52,33 +74,37 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/Main.java">
+      <file leaf-file-name="WeatherHandlers.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
+            <state vertical-scroll-proportion="0.3317647">
+              <caret line="139" column="21" selection-start-line="139" selection-start-column="21" selection-end-line="139" selection-end-column="21" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="SenderHelper.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java">
+      <file leaf-file-name="Message.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.56">
-              <caret line="48" column="0" selection-start-line="48" selection-start-column="0" selection-end-line="48" selection-end-column="0" />
+            <state vertical-scroll-proportion="0.0">
+              <caret line="212" column="25" selection-start-line="212" selection-start-column="25" selection-end-line="212" selection-end-column="25" />
               <folding>
-                <element signature="docComment;class#SenderHelper#0" expanded="false" />
+                <element signature="e#10180#10181#0" expanded="true" />
+                <element signature="e#10223#10224#0" expanded="true" />
+                <element signature="e#10267#10268#0" expanded="true" />
+                <element signature="e#10313#10314#0" expanded="true" />
+                <element signature="method#serialize#0;class#Message#0" expanded="false" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="BotConfig.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java">
+      <file leaf-file-name="DirectionsHandlers.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="24" column="94" selection-start-line="24" selection-start-column="94" selection-end-line="24" selection-end-column="94" />
+              <caret line="74" column="81" selection-start-line="74" selection-start-column="81" selection-end-line="74" selection-end-column="81" />
               <folding />
             </state>
           </provider>
@@ -119,41 +145,13 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/methods/SetWebhook.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/methods/SendMessage.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ReplyKeyboard.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/localisation/strings.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ApiBool.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/UserProfilePhotos.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetMe.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetUserProfilePhotos.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/UpdatesCallback.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/interfaces/BotApiObject.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/interfaces/IToJson.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/BotApiMethod.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/SentCallback.java" />
-        <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/RestApi.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/File.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetFile.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Chat.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java" />
-        <option value="/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/Integer.java" />
         <option value="/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/Number.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/ForwardMessage.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendAudio.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendChatAction.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendLocation.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendPhoto.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendSticker.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVideo.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVoice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendMessage.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/services/TimerExecutor.java" />
@@ -161,19 +159,48 @@
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/services/TransifexService.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/database/ConectionDB.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/services/WeatherService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/services/BotLogger.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/localisation/strings_eo.properties" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/services/LocalisationService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendDocument.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java" />
         <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/localisation/strings_eo.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/database/CreationStrings.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Audio.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Chat.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Contact.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Document.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/File.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ForceReplyKeyboard.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Location.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/PhotoSize.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ReplyKeyboardHide.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ReplyKeyboardMarkup.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Sticker.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Update.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/User.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/UserProfilePhotos.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Video.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Voice.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/ForwardMessage.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetFile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetMe.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetUserProfilePhotos.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendChatAction.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendLocation.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendMessage.java" />
+        <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java" />
       </list>
     </option>
   </component>
   <component name="JsBuildToolGruntFileManager" detection-done="true" />
+  <component name="JsBuildToolPackageJson" detection-done="true" />
   <component name="JsGulpfileManager">
     <detection-done>true</detection-done>
   </component>
@@ -217,9 +244,6 @@
       </PATH>
     </treeState>
   </component>
-  <component name="NamedScopeManager">
-    <order />
-  </component>
   <component name="ProjectFrameBounds">
     <option name="width" value="1366" />
     <option name="height" value="768" />
@@ -357,10 +381,10 @@
       <autoscrollToSource />
       <autoscrollFromSource />
       <sortByType />
+      <manualOrder />
+      <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scratches" />
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -531,7 +555,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="structure" />
+              <option name="myItemId" value="database" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -561,7 +585,41 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="services" />
+              <option name="myItemId" value="api" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="objects" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="BotAPi" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="BotAPi" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="telegram" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="api" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -582,6 +640,8 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
+      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -624,6 +684,7 @@
     <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
     <property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="921" />
     <property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
+    <property name="js-jscs-nodeInterpreter" value="/usr/local/bin/node" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
@@ -690,6 +751,15 @@
       <option name="CLEAR_LOGCAT" value="false" />
       <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
       <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
+      <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" />
+      <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
+      <option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" />
+      <option name="SELECTED_CLOUD_DEVICE_PROJECT_ID" value="" />
+      <option name="IS_VALID_CLOUD_MATRIX_SELECTION" value="false" />
+      <option name="INVALID_CLOUD_MATRIX_SELECTION_ERROR" value="" />
+      <option name="IS_VALID_CLOUD_DEVICE_SELECTION" value="false" />
+      <option name="INVALID_CLOUD_DEVICE_SELECTION_ERROR" value="" />
+      <option name="CLOUD_DEVICE_SERIAL_NUMBER" value="" />
       <method />
     </configuration>
     <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
@@ -711,6 +781,15 @@
       <option name="CLEAR_LOGCAT" value="false" />
       <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
       <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
+      <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" />
+      <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
+      <option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" />
+      <option name="SELECTED_CLOUD_DEVICE_PROJECT_ID" value="" />
+      <option name="IS_VALID_CLOUD_MATRIX_SELECTION" value="false" />
+      <option name="INVALID_CLOUD_MATRIX_SELECTION_ERROR" value="" />
+      <option name="IS_VALID_CLOUD_DEVICE_SELECTION" value="false" />
+      <option name="INVALID_CLOUD_DEVICE_SELECTION_ERROR" value="" />
+      <option name="CLOUD_DEVICE_SERIAL_NUMBER" value="" />
       <method />
     </configuration>
     <configuration default="true" type="Applet" factoryName="Applet">
@@ -735,6 +814,65 @@
       <envs />
       <method />
     </configuration>
+    <configuration default="true" type="ArquillianJUnit" factoryName="">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="arquillianRunConfiguration">
+        <value>
+          <option name="containerStateName" value="" />
+        </value>
+      </option>
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+      <method />
+    </configuration>
+    <configuration default="true" type="ArquillianTestNG" factoryName="">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="arquillianRunConfiguration">
+        <value>
+          <option name="containerStateName" value="" />
+        </value>
+      </option>
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SUITE_NAME" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="GROUP_NAME" />
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" />
+      <option name="OUTPUT_DIRECTORY" />
+      <option name="ANNOTATION_TYPE" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
+      <option name="PROPERTIES_FILE" />
+      <envs />
+      <properties />
+      <listeners />
+      <method />
+    </configuration>
     <configuration default="true" type="CucumberJavaRunConfigurationType" factoryName="Cucumber java">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <option name="myFilePath" />
@@ -850,14 +988,64 @@
       <patterns />
       <method />
     </configuration>
+    <configuration default="true" type="JUnitTestDiscovery" factoryName="JUnit Test Discovery" changeList="All">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+      <method />
+    </configuration>
     <configuration default="true" type="JarApplication" factoryName="JAR Application">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <envs />
       <method />
     </configuration>
+    <configuration default="true" type="Java Scratch" factoryName="Java Scratch">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <option name="SCRATCH_FILE_ID" value="0" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+      <method />
+    </configuration>
     <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
       <method />
     </configuration>
+    <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="BotAPi" />
+      <envs />
+      <method />
+    </configuration>
     <configuration default="true" type="MavenRunConfiguration" factoryName="Maven">
       <MavenSettings>
         <option name="myGeneralSettings" />
@@ -925,6 +1113,34 @@
       <listeners />
       <method />
     </configuration>
+    <configuration default="true" type="TestNGTestDiscovery" factoryName="TestNG Test Discovery" changeList="All">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SUITE_NAME" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="GROUP_NAME" />
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" />
+      <option name="OUTPUT_DIRECTORY" />
+      <option name="ANNOTATION_TYPE" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
+      <option name="PROPERTIES_FILE" />
+      <envs />
+      <properties />
+      <listeners />
+      <method />
+    </configuration>
     <configuration default="true" type="executeSpecs" factoryName="Gauge Execution">
       <setting name="environment" value="" />
       <setting name="specsToExecute" value="" />
@@ -947,6 +1163,12 @@
       <envs />
       <method />
     </configuration>
+    <configuration default="true" type="js.build_tools.npm" factoryName="npm">
+      <command value="run-script" />
+      <scripts />
+      <envs />
+      <method />
+    </configuration>
     <configuration default="true" type="mocha-javascript-test-runner" factoryName="Mocha">
       <node-options />
       <working-directory>$PROJECT_DIR$</working-directory>
@@ -954,6 +1176,7 @@
       <envs />
       <ui>bdd</ui>
       <extra-mocha-options />
+      <test-kind>DIRECTORY</test-kind>
       <test-directory />
       <recursive>false</recursive>
       <method />
@@ -1090,31 +1313,11 @@
       <workItem from="1446055333504" duration="795000" />
       <workItem from="1446066757201" duration="1347000" />
       <workItem from="1446749977897" duration="1361000" />
-      <workItem from="1447281740198" duration="348000" />
-    </task>
-    <task id="LOCAL-00001" summary="First Commit:&#10;1. Transifex bot&#10;2. Weather bot">
-      <created>1434854005227</created>
-      <option name="number" value="00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1434854005227</updated>
-    </task>
-    <task id="LOCAL-00002" summary="First Commit:&#10;1. Fix pom.xml and related&#10;2. First files vault verions">
-      <created>1434896932077</created>
-      <option name="number" value="00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1434896932077</updated>
-    </task>
-    <task id="LOCAL-00003" summary="1. Fix pom.xml and related">
-      <created>1434896979344</created>
-      <option name="number" value="00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1434896979344</updated>
-    </task>
-    <task id="LOCAL-00004" summary="1. Files bot&#10;2. Locations for weatherbot">
-      <created>1434904623863</created>
-      <option name="number" value="00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1434904623863</updated>
+      <workItem from="1447281740198" duration="1936000" />
+      <workItem from="1447608579321" duration="256000" />
+      <workItem from="1447608913139" duration="1229000" />
+      <workItem from="1447966784133" duration="1129000" />
+      <workItem from="1448148850077" duration="1003000" />
     </task>
     <task id="LOCAL-00005" summary="1. Fix help message">
       <created>1434905289461</created>
@@ -1386,11 +1589,35 @@
       <option name="project" value="LOCAL" />
       <updated>1444855140616</updated>
     </task>
-    <option name="localTasksCounter" value="50" />
+    <task id="LOCAL-00050" summary="1. Esperanto&#10;">
+      <created>1447282141578</created>
+      <option name="number" value="00050" />
+      <option name="project" value="LOCAL" />
+      <updated>1447282141579</updated>
+    </task>
+    <task id="LOCAL-00051" summary="1. fix esperanto">
+      <created>1447284479323</created>
+      <option name="number" value="00051" />
+      <option name="project" value="LOCAL" />
+      <updated>1447284479323</updated>
+    </task>
+    <task id="LOCAL-00052" summary="1. Fix possible flood hit&#10;">
+      <created>1447284695900</created>
+      <option name="number" value="00052" />
+      <option name="project" value="LOCAL" />
+      <updated>1447284695901</updated>
+    </task>
+    <task id="LOCAL-00053" summary="1. Improved support for channels&#10;">
+      <created>1447967835440</created>
+      <option name="number" value="00053" />
+      <option name="project" value="LOCAL" />
+      <updated>1447967835441</updated>
+    </task>
+    <option name="localTasksCounter" value="54" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="264963000" />
+    <option name="totallyTimeSpent" value="270168000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1405,66 +1632,66 @@
     <frame x="0" y="0" width="1366" height="768" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295129" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32886904" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.27793697" sideWeight="0.5120846" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16691843" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32440478" sideWeight="0.49697885" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32886904" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26283988" sideWeight="0.8281623" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19335347" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19561933" sideWeight="0.1718377" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.4002976" sideWeight="0.4879154" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Dynamic Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Database Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32886904" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32589287" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295129" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27793697" sideWeight="0.5120846" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16691843" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32440478" sideWeight="0.49697885" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32886904" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16163142" sideWeight="0.8281623" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19335347" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32589287" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Dynamic Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19561933" sideWeight="0.1718377" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4002976" sideWeight="0.4879154" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32886904" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Database Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32886904" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.27793697" sideWeight="0.5120846" order="9" side_tool="true" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19335347" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Dynamic Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.39285713" sideWeight="0.4879154" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295129" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32886904" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32857144" sideWeight="0.49697885" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295129" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
-      <window_info id="Database Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32886904" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19561933" sideWeight="0.8281623" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3264095" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19561933" sideWeight="0.1718377" order="4" side_tool="true" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27793697" sideWeight="0.5120846" order="9" side_tool="true" content_ui="tabs" />
+      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32930514" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19335347" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Dynamic Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.39285713" sideWeight="0.4879154" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295129" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32886904" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32857144" sideWeight="0.49697885" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295129" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
+      <window_info id="Database Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32886904" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19561933" sideWeight="0.8281623" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3264095" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19561933" sideWeight="0.1718377" order="4" side_tool="true" content_ui="tabs" />
     </layout-to-restore>
   </component>
   <component name="Vcs.Log.UiProperties">
@@ -1479,10 +1706,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="1. Fix webhooks, they only allow port 443" />
-    <MESSAGE value="1. Fixed loggin levels" />
-    <MESSAGE value="1. Several fixes" />
-    <MESSAGE value="1. Localization" />
     <MESSAGE value="1. Fix" />
     <MESSAGE value="1. Refactor weatherbot" />
     <MESSAGE value="1. Refactor directionsbot&#10;" />
@@ -1504,7 +1727,12 @@
     <MESSAGE value="1. Webhooks&#10;" />
     <MESSAGE value="1. Support for channels&#10;" />
     <MESSAGE value="1. Example of bot for channels&#10;" />
-    <option name="LAST_COMMIT_MESSAGE" value="1. Example of bot for channels&#10;" />
+    <MESSAGE value="1. Esperanto&#10;" />
+    <MESSAGE value="1. fix esperanto" />
+    <MESSAGE value="1. Fix possible flood hit&#10;" />
+    <MESSAGE value="1. Improved support for channels&#10;" />
+    <option name="LAST_COMMIT_MESSAGE" value="1. Improved support for channels&#10;" />
+    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1527,12 +1755,6 @@
           <properties />
           <option name="timeStamp" value="84" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java</url>
-          <line>120</line>
-          <properties />
-          <option name="timeStamp" value="178" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java</url>
           <line>58</line>
@@ -1551,11 +1773,17 @@
           <properties />
           <option name="timeStamp" value="270" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java</url>
+          <line>130</line>
+          <properties />
+          <option name="timeStamp" value="281" />
+        </line-breakpoint>
       </breakpoints>
       <breakpoints-dialog>
         <breakpoints-dialog />
       </breakpoints-dialog>
-      <option name="time" value="276" />
+      <option name="time" value="283" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -1564,378 +1792,449 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/BotApiMethod.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/TimerExecutor.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3317647">
-          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="104" column="29" selection-start-line="104" selection-start-column="29" selection-end-line="104" selection-end-column="29" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetMe.java">
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/util/ResourceBundle.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.1294118">
-          <caret line="42" column="29" selection-start-line="42" selection-start-column="29" selection-end-line="42" selection-end-column="29" />
+        <state vertical-scroll-proportion="0.61333334">
+          <caret line="1075" column="33" selection-start-line="1075" selection-start-column="33" selection-end-line="1075" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetUpdates.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.0117648">
-          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+        <state vertical-scroll-proportion="0.68">
+          <caret line="24" column="94" selection-start-line="24" selection-start-column="94" selection-end-line="24" selection-end-column="94" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/json/json/20141113/json-20141113-sources.jar!/org/json/JSONObject.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33333334">
-          <caret line="963" column="18" selection-start-line="963" selection-start-column="18" selection-end-line="963" selection-end-column="18" />
+        <state vertical-scroll-proportion="0.79466665">
+          <caret line="33" column="68" selection-start-line="33" selection-start-column="10" selection-end-line="33" selection-end-column="68" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/Number.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/BotLogger.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33333334">
-          <caret line="54" column="22" selection-start-line="54" selection-start-column="22" selection-end-line="54" selection-end-column="22" />
+        <state vertical-scroll-proportion="1.2293333">
+          <caret line="39" column="34" selection-start-line="39" selection-start-column="34" selection-end-line="39" selection-end-column="34" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/Number.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/LocalisationService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33333334">
-          <caret line="54" column="22" selection-start-line="54" selection-start-column="22" selection-end-line="54" selection-end-column="22" />
+        <state vertical-scroll-proportion="0.5226667">
+          <caret line="153" column="19" selection-start-line="153" selection-start-column="19" selection-end-line="153" selection-end-column="19" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/Integer.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/localisation/strings_eo.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.49333334">
-          <caret line="51" column="37" selection-start-line="51" selection-start-column="37" selection-end-line="51" selection-end-column="37" />
+        <state vertical-scroll-proportion="0.72">
+          <caret line="74" column="24" selection-start-line="74" selection-start-column="24" selection-end-line="74" selection-end-column="24" />
         </state>
       </provider>
+      <provider editor-type-id="ResourceBundle">
+        <state />
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetUserProfilePhotos.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.24">
-          <caret line="79" column="38" selection-start-line="79" selection-start-column="38" selection-end-line="79" selection-end-column="38" />
+        <state vertical-scroll-proportion="0.35869566">
+          <caret line="58" column="17" selection-start-line="58" selection-start-column="17" selection-end-line="58" selection-end-column="17" />
+          <folding>
+            <element signature="docComment;class#SenderHelper#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SetWebhook.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44266668">
-          <caret line="25" column="5" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
+        <state vertical-scroll-proportion="0.59624416">
+          <caret line="124" column="45" selection-start-line="124" selection-start-column="45" selection-end-line="124" selection-end-column="45" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendDocument.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6">
-          <caret line="15" column="82" selection-start-line="15" selection-start-column="82" selection-end-line="15" selection-end-column="82" />
+        <state vertical-scroll-proportion="0.6666667">
+          <caret line="92" column="73" selection-start-line="92" selection-start-column="73" selection-end-line="92" selection-end-column="73" />
+          <folding>
+            <element signature="imports" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/ForwardMessage.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.369969">
-          <caret line="79" column="45" selection-start-line="79" selection-start-column="45" selection-end-line="79" selection-end-column="45" />
+        <state vertical-scroll-proportion="0.19014084">
+          <caret line="208" column="17" selection-start-line="208" selection-start-column="17" selection-end-line="208" selection-end-column="17" />
+          <folding>
+            <element signature="imports" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendAudio.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/database/CreationStrings.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.047987618">
-          <caret line="47" column="5" selection-start-line="47" selection-start-column="5" selection-end-line="47" selection-end-column="5" />
+        <state vertical-scroll-proportion="0.31690142">
+          <caret line="9" column="39" selection-start-line="9" selection-start-column="39" selection-end-line="9" selection-end-column="39" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendChatAction.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.5789474">
-          <caret line="83" column="31" selection-start-line="83" selection-start-column="31" selection-end-line="83" selection-end-column="31" />
+        <state vertical-scroll-proportion="0.29342723">
+          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendLocation.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Audio.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.1594427">
-          <caret line="122" column="51" selection-start-line="122" selection-start-column="51" selection-end-line="122" selection-end-column="51" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="131" column="8" selection-start-line="131" selection-start-column="8" selection-end-line="131" selection-end-column="36" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendPhoto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Contact.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.14086688">
-          <caret line="38" column="5" selection-start-line="38" selection-start-column="5" selection-end-line="38" selection-end-column="5" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="65" column="36" selection-start-line="65" selection-start-column="36" selection-end-line="65" selection-end-column="36" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendSticker.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Document.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.23374613">
-          <caret line="35" column="5" selection-start-line="35" selection-start-column="5" selection-end-line="35" selection-end-column="5" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="116" column="36" selection-start-line="116" selection-start-column="36" selection-end-line="116" selection-end-column="36" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVideo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/File.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0015479876">
-          <caret line="35" column="17" selection-start-line="35" selection-start-column="17" selection-end-line="35" selection-end-column="17" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="83" column="36" selection-start-line="83" selection-start-column="36" selection-end-line="83" selection-end-column="36" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVoice.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ForceReplyKeyboard.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="17" column="105" selection-start-line="17" selection-start-column="105" selection-end-line="17" selection-end-column="105" />
+          <caret line="91" column="36" selection-start-line="91" selection-start-column="36" selection-end-line="91" selection-end-column="36" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Chat.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Location.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="127" column="13" selection-start-line="127" selection-start-column="13" selection-end-line="127" selection-end-column="13" />
+          <caret line="63" column="36" selection-start-line="63" selection-start-column="36" selection-end-line="63" selection-end-column="36" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/lang/NoSuchMethodError.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ReplyKeyboard.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5340557">
-          <caret line="46" column="11" selection-start-line="46" selection-start-column="11" selection-end-line="46" selection-end-column="11" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/io/ObjectStreamException.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ReplyKeyboardHide.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.23219815">
-          <caret line="33" column="22" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="85" column="36" selection-start-line="85" selection-start-column="36" selection-end-line="85" selection-end-column="36" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/src.zip!/java/io/InvalidObjectException.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ReplyKeyboardMarkup.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.32507738">
-          <caret line="37" column="49" selection-start-line="37" selection-start-column="49" selection-end-line="37" selection-end-column="49" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="153" column="36" selection-start-line="153" selection-start-column="36" selection-end-line="153" selection-end-column="36" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendMessage.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Sticker.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.1114552">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="70" column="36" selection-start-line="70" selection-start-column="36" selection-end-line="70" selection-end-column="36" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Update.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.071207434">
-          <caret line="28" column="62" selection-start-line="28" selection-start-column="62" selection-end-line="28" selection-end-column="62" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="65" column="36" selection-start-line="65" selection-start-column="36" selection-end-line="65" selection-end-column="36" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/User.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.25541794">
-          <caret line="35" column="57" selection-start-line="35" selection-start-column="57" selection-end-line="35" selection-end-column="57" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="81" column="36" selection-start-line="81" selection-start-column="36" selection-end-line="81" selection-end-column="36" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/UserProfilePhotos.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.25541794">
-          <caret line="24" column="61" selection-start-line="24" selection-start-column="61" selection-end-line="24" selection-end-column="61" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="87" column="36" selection-start-line="87" selection-start-column="36" selection-end-line="87" selection-end-column="36" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/SentCallback.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Video.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4876161">
-          <caret line="22" column="81" selection-start-line="22" selection-start-column="81" selection-end-line="22" selection-end-column="81" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="139" column="36" selection-start-line="139" selection-start-column="36" selection-end-line="139" selection-end-column="36" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/UpdatesCallback.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Voice.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4876161">
-          <caret line="22" column="29" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="29" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="96" column="36" selection-start-line="96" selection-start-column="36" selection-end-line="96" selection-end-column="36" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/Webhook.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/BotApiMethod.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44272447">
-          <caret line="58" column="39" selection-start-line="58" selection-start-column="39" selection-end-line="58" selection-end-column="39" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/Constants.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.6702785">
-          <caret line="138" column="36" selection-start-line="138" selection-start-column="36" selection-end-line="138" selection-end-column="36" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updatesreceivers/RestApi.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/ForwardMessage.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.37306502">
-          <caret line="31" column="19" selection-start-line="31" selection-start-column="19" selection-end-line="31" selection-end-column="19" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="67" column="36" selection-start-line="67" selection-start-column="36" selection-end-line="67" selection-end-column="36" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/TimerExecutor.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetFile.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6453901">
-          <caret line="104" column="29" selection-start-line="104" selection-start-column="29" selection-end-line="104" selection-end-column="29" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="52" column="36" selection-start-line="52" selection-start-column="36" selection-end-line="52" selection-end-column="36" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/Commands.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetMe.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.28368795">
-          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="47" column="36" selection-start-line="47" selection-start-column="36" selection-end-line="47" selection-end-column="36" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/DirectionsService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetUpdates.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.56028366">
-          <caret line="100" column="27" selection-start-line="100" selection-start-column="27" selection-end-line="100" selection-end-column="27" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/TransifexService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/GetUserProfilePhotos.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="7.6950355">
-          <caret line="227" column="39" selection-start-line="227" selection-start-column="39" selection-end-line="227" selection-end-column="39" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="100" column="36" selection-start-line="100" selection-start-column="36" selection-end-line="100" selection-end-column="36" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/database/ConectionDB.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendAudio.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.47517732">
-          <caret line="83" column="36" selection-start-line="83" selection-start-column="36" selection-end-line="83" selection-end-column="36" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/WeatherService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.070922">
-          <caret line="264" column="36" selection-start-line="264" selection-start-column="36" selection-end-line="264" selection-end-column="36" />
-          <folding />
+        <state vertical-scroll-proportion="0.8802817">
+          <caret line="237" column="130" selection-start-line="237" selection-start-column="130" selection-end-line="237" selection-end-column="130" />
+          <folding>
+            <element signature="docComment;class#WeatherService#0" expanded="false" />
+            <element signature="docComment;method#WeatherService#0;class#WeatherService#0" expanded="false" />
+            <element signature="method#WeatherService#0;class#WeatherService#0" expanded="false" />
+            <element signature="docComment;method#getInstance#0;class#WeatherService#0" expanded="false" />
+            <element signature="method#getInstance#0;class#WeatherService#0" expanded="false" />
+            <element signature="docComment;method#fetchWeatherAlert#0;class#WeatherService#0" expanded="false" />
+            <element signature="method#fetchWeatherAlert#0;class#WeatherService#0" expanded="false" />
+            <element signature="docComment;method#fetchWeatherForecast#0;class#WeatherService#0" expanded="false" />
+            <element signature="method#fetchWeatherForecast#0;class#WeatherService#0" expanded="false" />
+            <element signature="docComment;method#fetchWeatherForecastByLocation#0;class#WeatherService#0" expanded="false" />
+            <element signature="method#fetchWeatherForecastByLocation#0;class#WeatherService#0" expanded="false" />
+            <element signature="docComment;method#fetchWeatherCurrent#0;class#WeatherService#0" expanded="false" />
+            <element signature="method#fetchWeatherCurrent#0;class#WeatherService#0" expanded="false" />
+            <element signature="docComment;method#fetchWeatherCurrentByLocation#0;class#WeatherService#0" expanded="false" />
+            <element signature="method#fetchWeatherCurrentByLocation#0;class#WeatherService#0" expanded="false" />
+            <element signature="method#convertCurrentWeatherToString#0;class#WeatherService#0" expanded="false" />
+            <element signature="docComment;method#convertListOfForecastToString#0;class#WeatherService#0" expanded="false" />
+            <element signature="method#convertListOfForecastToString#0;class#WeatherService#0" expanded="false" />
+            <element signature="docComment;method#convertInternalInformationToString#0;class#WeatherService#0" expanded="false" />
+            <element signature="method#convertInternalInformationToString#0;class#WeatherService#0" expanded="false" />
+            <element signature="method#saveRecentWeather#0;class#WeatherService#0" expanded="false" />
+            <element signature="method#getCityQuery#0;class#WeatherService#0" expanded="false" />
+            <element signature="method#getEmojiForWeather#0;class#WeatherService#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SetWebhook.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.61702126">
-          <caret line="91" column="36" selection-start-line="91" selection-start-column="36" selection-end-line="91" selection-end-column="36" />
+        <state vertical-scroll-proportion="0.15492958">
+          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/BotLogger.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVoice.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.48">
-          <caret line="39" column="34" selection-start-line="39" selection-start-column="34" selection-end-line="39" selection-end-column="34" />
+        <state vertical-scroll-proportion="0.22535211">
+          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/CustomTimerTask.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendSticker.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="3" column="25" selection-start-line="3" selection-start-column="25" selection-end-line="3" selection-end-column="25" />
+        <state vertical-scroll-proportion="-0.8309859">
+          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendPhoto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.04643963">
-          <caret line="233" column="0" selection-start-line="233" selection-start-column="0" selection-end-line="233" selection-end-column="0" />
+        <state vertical-scroll-proportion="-1.0774648">
+          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendMessage.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.074666664">
-          <caret line="10" column="29" selection-start-line="10" selection-start-column="29" selection-end-line="10" selection-end-column="29" />
+        <state vertical-scroll-proportion="0.6830986">
+          <caret line="145" column="36" selection-start-line="145" selection-start-column="36" selection-end-line="145" selection-end-column="36" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendLocation.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="180" column="0" selection-start-line="180" selection-start-column="0" selection-end-line="180" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.6830986">
+          <caret line="120" column="36" selection-start-line="120" selection-start-column="36" selection-end-line="120" selection-end-column="36" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/services/LocalisationService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendDocument.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35913312">
-          <caret line="190" column="26" selection-start-line="190" selection-start-column="26" selection-end-line="190" selection-end-column="26" />
+        <state vertical-scroll-proportion="-0.8309859">
+          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.1/httpclient-4.5.1-sources.jar!/org/apache/http/impl/client/HttpClientBuilder.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendChatAction.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="376" column="100" selection-start-line="376" selection-start-column="92" selection-end-line="376" selection-end-column="100" />
+        <state vertical-scroll-proportion="0.6830986">
+          <caret line="83" column="36" selection-start-line="83" selection-start-column="36" selection-end-line="83" selection-end-column="36" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendVideo.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4">
-          <caret line="101" column="9" selection-start-line="101" selection-start-column="9" selection-end-line="101" selection-end-column="9" />
+        <state vertical-scroll-proportion="-1.2535211">
+          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/PhotoSize.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="24" column="94" selection-start-line="24" selection-start-column="94" selection-end-line="24" selection-end-column="94" />
+        <state vertical-scroll-proportion="0.6830986">
+          <caret line="93" column="36" selection-start-line="93" selection-start-column="36" selection-end-line="93" selection-end-column="36" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/localisation/strings_eo.properties">
-      <provider editor-type-id="ResourceBundle">
-        <state />
-      </provider>
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Chat.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.7414861">
-          <caret line="75" column="0" selection-start-line="75" selection-start-column="0" selection-end-line="75" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.6141176">
+          <caret line="68" column="22" selection-start-line="68" selection-start-column="22" selection-end-line="68" selection-end-column="22" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.idea/resourceBundles.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.23291926">
-          <caret line="10" column="10" selection-start-line="10" selection-start-column="10" selection-end-line="10" selection-end-column="10" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="74" column="81" selection-start-line="74" selection-start-column="81" selection-end-line="74" selection-end-column="81" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/Main.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Message.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
-          <folding />
+          <caret line="212" column="25" selection-start-line="212" selection-start-column="25" selection-end-line="212" selection-end-column="25" />
+          <folding>
+            <element signature="e#10180#10181#0" expanded="true" />
+            <element signature="e#10223#10224#0" expanded="true" />
+            <element signature="e#10267#10268#0" expanded="true" />
+            <element signature="e#10313#10314#0" expanded="true" />
+            <element signature="method#serialize#0;class#Message#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.56">
-          <caret line="48" column="0" selection-start-line="48" selection-start-column="0" selection-end-line="48" selection-end-column="0" />
-          <folding>
-            <element signature="docComment;class#SenderHelper#0" expanded="false" />
-          </folding>
+        <state vertical-scroll-proportion="0.3317647">
+          <caret line="139" column="21" selection-start-line="139" selection-start-column="21" selection-end-line="139" selection-end-column="21" />
+          <folding />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/org/telegram/api/methods/ForwardMessage.java b/src/main/java/org/telegram/api/methods/ForwardMessage.java
index d02f369..11a41f1 100644
--- a/src/main/java/org/telegram/api/methods/ForwardMessage.java
+++ b/src/main/java/org/telegram/api/methods/ForwardMessage.java
@@ -65,13 +65,7 @@ public class ForwardMessage extends BotApiMethod<Message> {
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeStringField(METHOD_FIELD, PATH);
-        gen.writeStringField(CHATID_FIELD, chatId);
-        gen.writeNumberField(FROMCHATID_FIELD, fromChatId);
-        gen.writeNumberField(MESSAGEID_FIELD, messageId);
-        gen.writeEndObject();
-        gen.flush();
+        serialize(gen, serializers);
     }
 
     @Override
diff --git a/src/main/java/org/telegram/api/methods/GetFile.java b/src/main/java/org/telegram/api/methods/GetFile.java
index 7c1e705..2f49040 100644
--- a/src/main/java/org/telegram/api/methods/GetFile.java
+++ b/src/main/java/org/telegram/api/methods/GetFile.java
@@ -5,7 +5,6 @@ import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 import org.json.JSONObject;
 import org.telegram.api.objects.File;
-import org.telegram.api.objects.Message;
 
 import java.io.IOException;
 
@@ -50,11 +49,7 @@ public class GetFile extends BotApiMethod<File> {
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeStringField(METHOD_FIELD, PATH);
-        gen.writeStringField(FILEID_FIELD, fileId);
-        gen.writeEndObject();
-        gen.flush();
+        serialize(gen, serializers);
     }
 
     @Override
diff --git a/src/main/java/org/telegram/api/methods/GetMe.java b/src/main/java/org/telegram/api/methods/GetMe.java
index a925df1..601686e 100644
--- a/src/main/java/org/telegram/api/methods/GetMe.java
+++ b/src/main/java/org/telegram/api/methods/GetMe.java
@@ -45,8 +45,6 @@ public class GetMe extends BotApiMethod<User> {
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeStringField(METHOD_FIELD, PATH);
-        gen.writeEndObject();
+        serialize(gen, serializers);
     }
 }
diff --git a/src/main/java/org/telegram/api/methods/GetUserProfilePhotos.java b/src/main/java/org/telegram/api/methods/GetUserProfilePhotos.java
index 161bdfe..90c032b 100644
--- a/src/main/java/org/telegram/api/methods/GetUserProfilePhotos.java
+++ b/src/main/java/org/telegram/api/methods/GetUserProfilePhotos.java
@@ -4,7 +4,6 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 import org.json.JSONObject;
-import org.telegram.api.objects.Message;
 import org.telegram.api.objects.UserProfilePhotos;
 
 import java.io.IOException;
@@ -98,14 +97,6 @@ public class GetUserProfilePhotos extends BotApiMethod<UserProfilePhotos> {
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeStringField(METHOD_FIELD, PATH);
-        gen.writeNumberField(USERID_FIELD, userId);
-        gen.writeNumberField(OFFSET_FIELD, offset);
-        if (limit != null) {
-            gen.writeNumberField(LIMIT_FIELD, limit);
-        }
-        gen.writeEndObject();
-        gen.flush();
+        serialize(gen, serializers);
     }
 }
diff --git a/src/main/java/org/telegram/api/methods/SendChatAction.java b/src/main/java/org/telegram/api/methods/SendChatAction.java
index d983683..f170000 100644
--- a/src/main/java/org/telegram/api/methods/SendChatAction.java
+++ b/src/main/java/org/telegram/api/methods/SendChatAction.java
@@ -81,9 +81,6 @@ public class SendChatAction extends BotApiMethod<Boolean>{
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeStringField(CHATID_FIELD, chatId);
-        gen.writeStringField(ACTION_FIELD, action);
-        gen.writeEndObject();
+        serialize(gen, serializers);
     }
 }
diff --git a/src/main/java/org/telegram/api/methods/SendLocation.java b/src/main/java/org/telegram/api/methods/SendLocation.java
index 81a9a3d..9e04b37 100644
--- a/src/main/java/org/telegram/api/methods/SendLocation.java
+++ b/src/main/java/org/telegram/api/methods/SendLocation.java
@@ -118,19 +118,6 @@ public class SendLocation extends BotApiMethod<Message> {
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeStringField(METHOD_FIELD, PATH);
-        gen.writeStringField(CHATID_FIELD, chatId);
-        gen.writeNumberField(LATITUDE_FIELD, latitude);
-        gen.writeNumberField(LONGITUDE_FIELD, longitude);
-        if (replayToMessageId != null) {
-            gen.writeNumberField(REPLYTOMESSAGEID_FIELD, replayToMessageId);
-        }
-        if (replayMarkup != null) {
-            gen.writeObjectField(REPLYMARKUP_FIELD, replayMarkup);
-        }
-
-        gen.writeEndObject();
-        gen.flush();
+        serialize(gen, serializers);
     }
 }
diff --git a/src/main/java/org/telegram/api/methods/SendMessage.java b/src/main/java/org/telegram/api/methods/SendMessage.java
index 80c84a7..3a4741e 100644
--- a/src/main/java/org/telegram/api/methods/SendMessage.java
+++ b/src/main/java/org/telegram/api/methods/SendMessage.java
@@ -143,25 +143,6 @@ public class SendMessage extends BotApiMethod<Message> {
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeStringField(METHOD_FIELD, PATH);
-        gen.writeStringField(CHATID_FIELD, chatId);
-        gen.writeStringField(TEXT_FIELD, text);
-
-        if (parseMode != null) {
-            gen.writeStringField(PARSEMODE_FIELD, parseMode);
-        }
-        if (disableWebPagePreview != null) {
-            gen.writeBooleanField(DISABLEWEBPAGEPREVIEW_FIELD, disableWebPagePreview);
-        }
-        if (replayToMessageId != null) {
-            gen.writeNumberField(REPLYTOMESSAGEID_FIELD, replayToMessageId);
-        }
-        if (replayMarkup != null) {
-            gen.writeObjectField(REPLYMARKUP_FIELD, replayMarkup);
-        }
-
-        gen.writeEndObject();
-        gen.flush();
+        serialize(gen, serializers);
     }
 }
diff --git a/src/main/java/org/telegram/api/objects/Audio.java b/src/main/java/org/telegram/api/objects/Audio.java
index 54fa19a..5ca8ec7 100644
--- a/src/main/java/org/telegram/api/objects/Audio.java
+++ b/src/main/java/org/telegram/api/objects/Audio.java
@@ -129,22 +129,6 @@ public class Audio implements BotApiObject {
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeStringField(FILEID_FIELD, fileId);
-        gen.writeNumberField(DURATION_FIELD, duration);
-        if (mimeType != null) {
-            gen.writeStringField(MIMETYPE_FIELD, mimeType);
-        }
-        if (fileSize != null) {
-            gen.writeNumberField(FILESIZE_FIELD, fileSize);
-        }
-        if (title != null) {
-            gen.writeStringField(TITLE_FIELD, title);
-        }
-        if (performer != null) {
-            gen.writeStringField(PERFORMER_FIELD, performer);
-        }
-        gen.writeEndObject();
-        gen.flush();
+        serialize(gen, serializers);
     }
 }
diff --git a/src/main/java/org/telegram/api/objects/Chat.java b/src/main/java/org/telegram/api/objects/Chat.java
index c797a58..68acd0c 100644
--- a/src/main/java/org/telegram/api/objects/Chat.java
+++ b/src/main/java/org/telegram/api/objects/Chat.java
@@ -19,6 +19,7 @@ public class Chat implements BotApiObject {
     private static final String USERCHATTYPE = "private";
     private static final String GROUPCHATTYPE = "group";
     private static final String CHANNELCHATTYPE = "channel";
+    private static final String SUPERGROUPCHATTYPE  = "supergroup";
 
     public static final String ID_FIELD = "id";
     @JsonProperty(ID_FIELD)
@@ -77,6 +78,10 @@ public class Chat implements BotApiObject {
         return USERCHATTYPE.equals(type);
     }
 
+    public Boolean isSuperGroupChat() {
+        return SUPERGROUPCHATTYPE.equals(type);
+    }
+
     public String getTitle() {
         return title;
     }
@@ -119,25 +124,6 @@ public class Chat implements BotApiObject {
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeNumberField(ID_FIELD, id);
-        gen.writeStringField(TYPE_FIELD, type);
-        if (isUserChat()) {
-            if (firstName != null) {
-                gen.writeStringField(FIRSTNAME_FIELD, firstName);
-            }
-            if (lastName != null) {
-                gen.writeStringField(LASTNAME_FIELD, lastName);
-            }
-        } else {
-            if (title != null) {
-                gen.writeStringField(TITLE_FIELD, title);
-            }
-        }
-        if (!isGroupChat() && userName != null) {
-            gen.writeStringField(USERNAME_FIELD, userName);
-        }
-        gen.writeEndObject();
-        gen.flush();
+        serialize(gen, serializers);
     }
 }
diff --git a/src/main/java/org/telegram/api/objects/Contact.java b/src/main/java/org/telegram/api/objects/Contact.java
index 7c0b4d0..499fbbe 100644
--- a/src/main/java/org/telegram/api/objects/Contact.java
+++ b/src/main/java/org/telegram/api/objects/Contact.java
@@ -63,16 +63,6 @@ public class Contact implements BotApiObject {
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeStringField(PHONENUMBER_FIELD, phoneNumber);
-        gen.writeStringField(FIRSTNAME_FIELD, firstName);
-        if (lastName != null) {
-            gen.writeStringField(LASTNAME_FIELD, lastName);
-        }
-        if (userID != null) {
-            gen.writeNumberField(USERID_FIELD, userID);
-        }
-        gen.writeEndObject();
-        gen.flush();
+        serialize(gen, serializers);
     }
 }
diff --git a/src/main/java/org/telegram/api/objects/Document.java b/src/main/java/org/telegram/api/objects/Document.java
index c6d0af1..e46242d 100644
--- a/src/main/java/org/telegram/api/objects/Document.java
+++ b/src/main/java/org/telegram/api/objects/Document.java
@@ -114,19 +114,6 @@ public class Document implements BotApiObject {
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeStringField(FILEID_FIELD, fileId);
-        gen.writeObjectField(THUMB_FIELD, thumb);
-        if (fileName != null) {
-            gen.writeStringField(FILENAME_FIELD, fileName);
-        }
-        if (mimeType != null) {
-            gen.writeStringField(MIMETYPE_FIELD, mimeType);
-        }
-        if (fileSize != null) {
-            gen.writeNumberField(FILESIZE_FIELD, fileSize);
-        }
-        gen.writeEndObject();
-        gen.flush();
+        serialize(gen, serializers);
     }
 }
diff --git a/src/main/java/org/telegram/api/objects/File.java b/src/main/java/org/telegram/api/objects/File.java
index 1f20cc1..1715aec 100644
--- a/src/main/java/org/telegram/api/objects/File.java
+++ b/src/main/java/org/telegram/api/objects/File.java
@@ -81,15 +81,6 @@ public class File implements BotApiObject {
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeStringField(FILE_ID, fileId);
-        if (fileSize != null) {
-            gen.writeNumberField(FILE_SIZE_FIELD, fileSize);
-        }
-        if (filePath != null) {
-            gen.writeStringField(FILE_PATH_FIELD, filePath);
-        }
-        gen.writeEndObject();
-        gen.flush();
+        serialize(gen, serializers);
     }
 }
diff --git a/src/main/java/org/telegram/api/objects/ForceReplyKeyboard.java b/src/main/java/org/telegram/api/objects/ForceReplyKeyboard.java
index d7c41e5..18ede01 100644
--- a/src/main/java/org/telegram/api/objects/ForceReplyKeyboard.java
+++ b/src/main/java/org/telegram/api/objects/ForceReplyKeyboard.java
@@ -89,10 +89,6 @@ public class ForceReplyKeyboard implements ReplyKeyboard {
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeBooleanField(FORCEREPLY_FIELD, forceReply);
-        gen.writeBooleanField(SELECTIVE_FIELD, selective);
-        gen.writeEndObject();
-        gen.flush();
+        serialize(gen, serializers);
     }
 }
diff --git a/src/main/java/org/telegram/api/objects/Location.java b/src/main/java/org/telegram/api/objects/Location.java
index bf1a63b..fae7c65 100644
--- a/src/main/java/org/telegram/api/objects/Location.java
+++ b/src/main/java/org/telegram/api/objects/Location.java
@@ -61,10 +61,6 @@ public class Location implements BotApiObject {
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeNumberField(LONGITUDE_FIELD, longitude);
-        gen.writeNumberField(LATITUDE_FIELD, latitude);
-        gen.writeEndObject();
-        gen.flush();
+        serialize(gen, serializers);
     }
 }
diff --git a/src/main/java/org/telegram/api/objects/Message.java b/src/main/java/org/telegram/api/objects/Message.java
index d3fc531..7bc1af8 100644
--- a/src/main/java/org/telegram/api/objects/Message.java
+++ b/src/main/java/org/telegram/api/objects/Message.java
@@ -85,6 +85,18 @@ public class Message implements BotApiObject {
     public static final String VOICE_FIELD = "voice";
     @JsonProperty(VOICE_FIELD)
     private Voice voice; ///< Optional. Message is a voice message, information about the file
+    public static final String SUPERGROUPCREATED_FIELD = "supergroup_chat_created";
+    @JsonProperty(SUPERGROUPCREATED_FIELD)
+    private Boolean superGroupCreated; ///< Optional. Informs that the supergroup has been created
+    public static final String CHANNELCHATCREATED_FIELD = "channel_chat_created";
+    @JsonProperty(CHANNELCHATCREATED_FIELD)
+    private Boolean channelChatCreated; ///< Optional. Informs that the channel has been created
+    public static final String MIGRATETOCHAT_FIELD = "migrate_to_chat_id";
+    @JsonProperty(MIGRATETOCHAT_FIELD)
+    private Long migrateToChatId; ///< Optional. The chat has been migrated to a chat with specified identifier, not exceeding 1e13 by absolute value
+    public static final String MIGRATEFROMCHAT_FIELD = "migrate_from_chat_id";
+    @JsonProperty(MIGRATEFROMCHAT_FIELD)
+    private Long migrateFromChatId; ///< Optional. The chat has been migrated from a chat with specified identifier, not exceeding 1e13 by absolute value
 
     public Message() {
         super();
@@ -155,10 +167,22 @@ public class Message implements BotApiObject {
             }
         }
         if (jsonObject.has(DELETECHATPHOTO_FIELD)) {
-            this.deleteChatPhoto = jsonObject.getBoolean(DELETECHATPHOTO_FIELD);
+            this.deleteChatPhoto = true;
         }
         if (jsonObject.has(GROUPCHATCREATED_FIELD)) {
-            this.groupchatCreated = jsonObject.getBoolean(GROUPCHATCREATED_FIELD);
+            this.groupchatCreated = true;
+        }
+        if (jsonObject.has(SUPERGROUPCREATED_FIELD)) {
+            this.superGroupCreated = true;
+        }
+        if (jsonObject.has(CHANNELCHATCREATED_FIELD)) {
+            this.channelChatCreated = true;
+        }
+        if (jsonObject.has(MIGRATETOCHAT_FIELD)) {
+            this.migrateToChatId = jsonObject.getLong(MIGRATETOCHAT_FIELD);
+        }
+        if (jsonObject.has(MIGRATEFROMCHAT_FIELD)) {
+            this.migrateFromChatId = jsonObject.getLong(MIGRATEFROMCHAT_FIELD);
         }
     }
 
@@ -198,6 +222,10 @@ public class Message implements BotApiObject {
         return chat.isChannelChat();
     }
 
+    public boolean isSuperGroupMessage() {
+        return chat.isSuperGroupChat();
+    }
+
     public Long getChatId() {
         return chat.getId();
     }
@@ -374,6 +402,38 @@ public class Message implements BotApiObject {
         this.voice = voice;
     }
 
+    public Boolean getSuperGroupCreated() {
+        return superGroupCreated;
+    }
+
+    public void setSuperGroupCreated(Boolean superGroupCreated) {
+        this.superGroupCreated = superGroupCreated;
+    }
+
+    public Boolean getChannelChatCreated() {
+        return channelChatCreated;
+    }
+
+    public void setChannelChatCreated(Boolean channelChatCreated) {
+        this.channelChatCreated = channelChatCreated;
+    }
+
+    public Long getMigrateToChatId() {
+        return migrateToChatId;
+    }
+
+    public void setMigrateToChatId(Long migrateToChatId) {
+        this.migrateToChatId = migrateToChatId;
+    }
+
+    public Long getMigrateFromChatId() {
+        return migrateFromChatId;
+    }
+
+    public void setMigrateFromChatId(Long migrateFromChatId) {
+        this.migrateFromChatId = migrateFromChatId;
+    }
+
     @Override
     public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeStartObject();
@@ -445,76 +505,24 @@ public class Message implements BotApiObject {
         if (groupchatCreated != null) {
             gen.writeBooleanField(GROUPCHATCREATED_FIELD, groupchatCreated);
         }
-        gen.writeEndObject();
-        gen.flush();
-    }
-
-    @Override
-    public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        if (forwardFrom != null) {
-            gen.writeObjectField(FORWARDFROM_FIELD, forwardFrom);
+        if (superGroupCreated != null) {
+            gen.writeBooleanField(SUPERGROUPCREATED_FIELD, superGroupCreated);
         }
-        if (forwardDate != null) {
-            gen.writeNumberField(FORWARDDATE_FIELD, forwardDate);
-        }
-        if (text != null) {
-            gen.writeStringField(TEXT_FIELD, text);
+        if (channelChatCreated != null) {
+            gen.writeBooleanField(CHANNELCHATCREATED_FIELD, channelChatCreated);
         }
-        if (audio != null) {
-            gen.writeObjectField(AUDIO_FIELD, audio);
+        if (migrateToChatId != null) {
+            gen.writeNumberField(MIGRATETOCHAT_FIELD, migrateToChatId);
         }
-        if (document != null) {
-            gen.writeObjectField(DOCUMENT_FIELD, document);
-        }
-        if (photo != null && photo.size() > 0) {
-            gen.writeArrayFieldStart(PHOTO_FIELD);
-            for (PhotoSize photoSize : photo) {
-                gen.writeObject(photoSize);
-            }
-            gen.writeEndArray();
-        }
-        if (sticker != null) {
-            gen.writeObjectField(STICKER_FIELD, sticker);
-        }
-        if (video != null) {
-            gen.writeObjectField(VIDEO_FIELD, video);
-        }
-        if (contact != null) {
-            gen.writeObjectField(CONTACT_FIELD, contact);
-        }
-        if (location != null) {
-            gen.writeObjectField(LOCATION_FIELD, location);
-        }
-        if (voice != null) {
-            gen.writeObjectField(VOICE_FIELD, voice);
-        }
-        if (newChatParticipant != null) {
-            gen.writeObjectField(NEWCHATPARTICIPANT_FIELD, newChatParticipant);
-        }
-        if (leftChatParticipant != null) {
-            gen.writeObjectField(LEFTCHATPARTICIPANT_FIELD, leftChatParticipant);
-        }
-        if (replyToMessage != null) {
-            gen.writeObjectField(REPLYTOMESSAGE_FIELD, replyToMessage);
-        }
-        if (newChatTitle != null) {
-            gen.writeStringField(NEWCHATTITLE_FIELD, newChatTitle);
-        }
-        if (newChatPhoto != null && newChatPhoto.size() > 0) {
-            gen.writeArrayFieldStart(NEWCHATPHOTO_FIELD);
-            for (PhotoSize photoSize: newChatPhoto) {
-                gen.writeObject(photoSize);
-            }
-            gen.writeEndArray();
-        }
-        if (deleteChatPhoto != null) {
-            gen.writeBooleanField(DELETECHATPHOTO_FIELD, deleteChatPhoto);
-        }
-        if (groupchatCreated != null) {
-            gen.writeBooleanField(GROUPCHATCREATED_FIELD, groupchatCreated);
+        if (migrateFromChatId != null) {
+            gen.writeNumberField(MIGRATEFROMCHAT_FIELD, migrateFromChatId);
         }
         gen.writeEndObject();
         gen.flush();
+    }
 
+    @Override
+    public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
+        serialize(gen, serializers);
     }
 }
diff --git a/src/main/java/org/telegram/api/objects/PhotoSize.java b/src/main/java/org/telegram/api/objects/PhotoSize.java
index 888616e..5ade74d 100644
--- a/src/main/java/org/telegram/api/objects/PhotoSize.java
+++ b/src/main/java/org/telegram/api/objects/PhotoSize.java
@@ -91,14 +91,6 @@ public class PhotoSize implements BotApiObject {
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeStringField(FILEID_FIELD, fileId);
-        gen.writeNumberField(WIDTH_FIELD, width);
-        gen.writeNumberField(HEIGHT_FIELD, height);
-        if (fileSize != null) {
-            gen.writeNumberField(FILESIZE_FIELD, fileSize);
-        }
-        gen.writeEndObject();
-        gen.flush();
+        serialize(gen, serializers);
     }
 }
diff --git a/src/main/java/org/telegram/api/objects/ReplyKeyboardHide.java b/src/main/java/org/telegram/api/objects/ReplyKeyboardHide.java
index 0f40d43..c6527a6 100644
--- a/src/main/java/org/telegram/api/objects/ReplyKeyboardHide.java
+++ b/src/main/java/org/telegram/api/objects/ReplyKeyboardHide.java
@@ -83,10 +83,6 @@ public class ReplyKeyboardHide implements ReplyKeyboard {
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeBooleanField(HIDEKEYBOARD_FIELD, hideKeyboard);
-        gen.writeBooleanField(SELECTIVE_FIELD, selective);
-        gen.writeEndObject();
-        gen.flush();
+        serialize(gen, serializers);
     }
 }
diff --git a/src/main/java/org/telegram/api/objects/ReplyKeyboardMarkup.java b/src/main/java/org/telegram/api/objects/ReplyKeyboardMarkup.java
index eaaa2ed..c320af3 100644
--- a/src/main/java/org/telegram/api/objects/ReplyKeyboardMarkup.java
+++ b/src/main/java/org/telegram/api/objects/ReplyKeyboardMarkup.java
@@ -151,26 +151,6 @@ public class ReplyKeyboardMarkup implements ReplyKeyboard {
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeArrayFieldStart(KEYBOARD_FIELD);
-        for (List<String> innerRow : keyboard) {
-            gen.writeStartArray();
-            for (String element: innerRow) {
-                gen.writeString(element);
-            }
-            gen.writeEndArray();
-        }
-        gen.writeEndArray();
-        if (this.oneTimeKeyboad != null) {
-            gen.writeBooleanField(ONETIMEKEYBOARD_FIELD, oneTimeKeyboad);
-        }
-        if (this.resizeKeyboard != null) {
-            gen.writeBooleanField(RESIZEKEYBOARD_FIELD, resizeKeyboard);
-        }
-        if (this.selective != null) {
-            gen.writeBooleanField(SELECTIVE_FIELD, selective);
-        }
-        gen.writeEndObject();
-        gen.flush();
+        serialize(gen, serializers);
     }
 }
diff --git a/src/main/java/org/telegram/api/objects/Sticker.java b/src/main/java/org/telegram/api/objects/Sticker.java
index 01860ef..d9c700f 100644
--- a/src/main/java/org/telegram/api/objects/Sticker.java
+++ b/src/main/java/org/telegram/api/objects/Sticker.java
@@ -68,17 +68,6 @@ public class Sticker implements BotApiObject {
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeStringField(FILEID_FIELD, fileId);
-        gen.writeNumberField(WIDTH_FIELD, width);
-        gen.writeNumberField(HEIGHT_FIELD, height);
-        if (thumb != null) {
-            gen.writeObjectField(THUMB_FIELD, thumb);
-        }
-        if (fileSize != null) {
-            gen.writeNumberField(FILESIZE_FIELD, fileSize);
-        }
-        gen.writeEndObject();
-        gen.flush();
+        serialize(gen, serializers);
     }
 }
diff --git a/src/main/java/org/telegram/api/objects/Update.java b/src/main/java/org/telegram/api/objects/Update.java
index 69d297d..f82a2e4 100644
--- a/src/main/java/org/telegram/api/objects/Update.java
+++ b/src/main/java/org/telegram/api/objects/Update.java
@@ -63,12 +63,6 @@ public class Update implements BotApiObject {
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeNumberField(UPDATEID_FIELD, updateId);
-        if (message != null) {
-            gen.writeObjectField(MESSAGE_FIELD, message);
-        }
-        gen.writeEndObject();
-        gen.flush();
+        serialize(gen, serializers);
     }
 }
diff --git a/src/main/java/org/telegram/api/objects/User.java b/src/main/java/org/telegram/api/objects/User.java
index a767af6..5ccaf22 100644
--- a/src/main/java/org/telegram/api/objects/User.java
+++ b/src/main/java/org/telegram/api/objects/User.java
@@ -79,16 +79,6 @@ public class User implements BotApiObject {
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeNumberField(ID_FIELD, id);
-        gen.writeStringField(FIRSTNAME_FIELD, firstName);
-        if (lastName != null) {
-            gen.writeStringField(LASTNAME_FIELD, lastName);
-        }
-        if (userName != null) {
-            gen.writeStringField(USERNAME_FIELD, userName);
-        }
-        gen.writeEndObject();
-        gen.flush();
+        serialize(gen, serializers);
     }
 }
diff --git a/src/main/java/org/telegram/api/objects/UserProfilePhotos.java b/src/main/java/org/telegram/api/objects/UserProfilePhotos.java
index 962e631..23ace48 100644
--- a/src/main/java/org/telegram/api/objects/UserProfilePhotos.java
+++ b/src/main/java/org/telegram/api/objects/UserProfilePhotos.java
@@ -85,20 +85,6 @@ public class UserProfilePhotos implements BotApiObject {
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeNumberField(TOTALCOUNT_FIELD, totalCount);
-        if (totalCount > 0) {
-            gen.writeArrayFieldStart(PHOTOS_FIELD);
-            for (List<PhotoSize> photoSizeList : photos) {
-                gen.writeStartArray();
-                for (PhotoSize photoSize: photoSizeList) {
-                    gen.writeObject(photoSize);
-                }
-                gen.writeEndArray();
-            }
-            gen.writeEndArray();
-        }
-        gen.writeEndObject();
-        gen.flush();
+        serialize(gen, serializers);
     }
 }
diff --git a/src/main/java/org/telegram/api/objects/Video.java b/src/main/java/org/telegram/api/objects/Video.java
index dbd0f06..b5be814 100644
--- a/src/main/java/org/telegram/api/objects/Video.java
+++ b/src/main/java/org/telegram/api/objects/Video.java
@@ -137,21 +137,6 @@ public class Video implements BotApiObject {
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeStringField(FILEID_FIELD, fileId);
-        gen.writeNumberField(WIDTH_FIELD, width);
-        gen.writeNumberField(HEIGHT_FIELD, height);
-        gen.writeNumberField(DURATION_FIELD, duration);
-        if (thumb != null) {
-            gen.writeObjectField(THUMB_FIELD, thumb);
-        }
-        if (mimeType != null) {
-            gen.writeStringField(MIMETYPE_FIELD, mimeType);
-        }
-        if (fileSize != null) {
-            gen.writeNumberField(FILESIZE_FIELD, fileSize);
-        }
-        gen.writeEndObject();
-        gen.flush();
+        serialize(gen, serializers);
     }
 }
diff --git a/src/main/java/org/telegram/api/objects/Voice.java b/src/main/java/org/telegram/api/objects/Voice.java
index ea01d3d..06fc9fb 100644
--- a/src/main/java/org/telegram/api/objects/Voice.java
+++ b/src/main/java/org/telegram/api/objects/Voice.java
@@ -94,16 +94,6 @@ public class Voice implements BotApiObject {
 
     @Override
     public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
-        gen.writeStartObject();
-        gen.writeStringField(FILEID_FIELD, fileId);
-        gen.writeNumberField(DURATION_FIELD, duration);
-        if (mimeType != null) {
-            gen.writeStringField(MIMETYPE_FIELD, mimeType);
-        }
-        if (fileSize != null) {
-            gen.writeNumberField(FILESIZE_FIELD, fileSize);
-        }
-        gen.writeEndObject();
-        gen.flush();
+        serialize(gen, serializers);
     }
 }

From 9a3a91b37d4d6c24f2b6581829f38ceb152a0de3 Mon Sep 17 00:00:00 2001
From: Rubenlagu <rberlopez@gmail.com>
Date: Tue, 24 Nov 2015 00:27:48 +0100
Subject: [PATCH 09/10] 1. Avoid weather bot to answer notifications (bot will
 only answer to text or location)

---
 src/main/java/org/telegram/updateshandlers/WeatherHandlers.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
index b803e40..3ed272b 100644
--- a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
+++ b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
@@ -98,7 +98,7 @@ public class WeatherHandlers implements UpdatesCallback {
     @Override
     public void onUpdateReceived(Update update) {
         Message message = update.getMessage();
-        if (message != null) {
+        if (message != null && (message.hasText() || message.hasLocation())) {
             BotApiMethod botApiMethod = handleIncomingMessage(message);
             try {
                 SenderHelper.SendApiMethod(botApiMethod, TOKEN);

From 26526368791a2fb27018e5ae8e6346c6752fdf08 Mon Sep 17 00:00:00 2001
From: Rubenlagu <rberlopez@gmail.com>
Date: Mon, 4 Jan 2016 13:37:24 +0100
Subject: [PATCH 10/10] 1. Added Inline support

---
 .gitignore                                    |  35 +++
 src/main/java/org/telegram/BotConfig.java     |   2 +
 src/main/java/org/telegram/Main.java          |   7 +-
 .../api/methods/AnswerInlineQuery.java        | 138 ++++++++++
 .../api/objects/ChosenInlineQuery.java        |  66 +++++
 .../org/telegram/api/objects/InlineQuery.java |  76 ++++++
 .../api/objects/InlineQueryResult.java        |  13 +
 .../api/objects/InlineQueryResultArticle.java | 233 ++++++++++++++++
 .../api/objects/InlineQueryResultGif.java     | 213 +++++++++++++++
 .../objects/InlineQueryResultMpeg4Gif.java    | 214 +++++++++++++++
 .../api/objects/InlineQueryResultPhoto.java   | 249 ++++++++++++++++++
 .../api/objects/InlineQueryResultVideo.java   | 245 +++++++++++++++++
 .../java/org/telegram/api/objects/Update.java |  52 +++-
 .../java/org/telegram/services/BotLogger.java |   2 +
 .../org/telegram/services/RaeService.java     | 231 ++++++++++++++++
 .../telegram/updateshandlers/RaeHandlers.java | 151 +++++++++++
 .../updateshandlers/WeatherHandlers.java      |  20 +-
 17 files changed, 1925 insertions(+), 22 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 src/main/java/org/telegram/api/methods/AnswerInlineQuery.java
 create mode 100644 src/main/java/org/telegram/api/objects/ChosenInlineQuery.java
 create mode 100644 src/main/java/org/telegram/api/objects/InlineQuery.java
 create mode 100644 src/main/java/org/telegram/api/objects/InlineQueryResult.java
 create mode 100644 src/main/java/org/telegram/api/objects/InlineQueryResultArticle.java
 create mode 100644 src/main/java/org/telegram/api/objects/InlineQueryResultGif.java
 create mode 100644 src/main/java/org/telegram/api/objects/InlineQueryResultMpeg4Gif.java
 create mode 100644 src/main/java/org/telegram/api/objects/InlineQueryResultPhoto.java
 create mode 100644 src/main/java/org/telegram/api/objects/InlineQueryResultVideo.java
 create mode 100644 src/main/java/org/telegram/services/RaeService.java
 create mode 100644 src/main/java/org/telegram/updateshandlers/RaeHandlers.java

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..42f24ce
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,35 @@
+### Maven template
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+### Java template
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# unneeded files
+.idea/dataSources.*
+.idea/workspace.xml
+
+# logs files
+*.log
+
+# Certs
+*.jks
+*.cer
+*.pem
\ No newline at end of file
diff --git a/src/main/java/org/telegram/BotConfig.java b/src/main/java/org/telegram/BotConfig.java
index 70e1a83..9f56e8e 100644
--- a/src/main/java/org/telegram/BotConfig.java
+++ b/src/main/java/org/telegram/BotConfig.java
@@ -17,4 +17,6 @@ public class BotConfig {
     public static final String USERNAMEDIRECTIONS = "directionsbot";
     public static final String TOKENCHANNEL = "<token>";
     public static final String USERNAMECHANNEL = "channelupdatesbot";
+    public static final String TOKENRAE = "<token>";
+    public static final String USERNAMERAE = "raebot";
 }
diff --git a/src/main/java/org/telegram/Main.java b/src/main/java/org/telegram/Main.java
index d02e043..0ecf15b 100644
--- a/src/main/java/org/telegram/Main.java
+++ b/src/main/java/org/telegram/Main.java
@@ -3,9 +3,6 @@ package org.telegram;
 import org.telegram.updateshandlers.*;
 import org.telegram.updatesreceivers.Webhook;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 /**
  * @author Ruben Bermudez
  * @version 1.0
@@ -24,8 +21,7 @@ public class Main {
         initBots();
 
         if (BuildVars.useWebHook) {
-            webhook.startDebugServer();
-            //webhook.startServer();
+            webhook.startServer();
         }
     }
 
@@ -35,5 +31,6 @@ public class Main {
         UpdatesCallback transifexBot = new TransifexHandlers(webhook);
         UpdatesCallback filesBot = new FilesHandlers(webhook);
         UpdatesCallback directionsBot = new DirectionsHandlers(webhook);
+        UpdatesCallback raeBot = new RaeHandlers(webhook);
     }
 }
diff --git a/src/main/java/org/telegram/api/methods/AnswerInlineQuery.java b/src/main/java/org/telegram/api/methods/AnswerInlineQuery.java
new file mode 100644
index 0000000..21071fb
--- /dev/null
+++ b/src/main/java/org/telegram/api/methods/AnswerInlineQuery.java
@@ -0,0 +1,138 @@
+package org.telegram.api.methods;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.telegram.api.objects.InlineQueryResult;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author Ruben Bermudez
+ * @version 1.0
+ * @brief Use this method to send answers to an inline query. On success, True is returned.
+ * @date 01 of January of 2016
+ */
+public class AnswerInlineQuery extends BotApiMethod<Boolean> {
+    public static final String PATH = "answerInlineQuery";
+
+    public static final String INLINEQUERYID_FIELD = "inline_query_id";
+    private String inlineQueryId; ///< Unique identifier for answered query
+    public static final String RESULTS_FIELD = "results";
+    private List<InlineQueryResult> results; ///< A JSON-serialized array of results for the inline query
+    public static final String CACHETIME_FIELD = "cache_time";
+    private Integer cacheTime; ///< Optional	The maximum amount of time the result of the inline query may be cached on the server
+    public static final String ISPERSONAL_FIELD = "is_personal";
+    private Boolean isPersonal; ///< Pass True, if results may be cached on the server side only for the user that sent the query. By default, results may be returned to any user who sends the same query
+    public static final String NEXTOFFSET_FIELD = "next_offset";
+    private String nextOffset; ///< Optional	Pass the offset that a client should send in the next query with the same text to receive more results. Pass an empty string if there are no more results or if you don‘t support pagination. Offset length can’t exceed 64 bytes.
+
+    public AnswerInlineQuery() {
+        super();
+    }
+
+    public String getInlineQueryId() {
+        return inlineQueryId;
+    }
+
+    public void setInlineQueryId(String inlineQueryId) {
+        this.inlineQueryId = inlineQueryId;
+    }
+
+    public List<InlineQueryResult> getResults() {
+        return results;
+    }
+
+    public void setResults(List<InlineQueryResult> results) {
+        this.results = results;
+    }
+
+    public Integer getCacheTime() {
+        return cacheTime;
+    }
+
+    public void setCacheTime(Integer cacheTime) {
+        this.cacheTime = cacheTime;
+    }
+
+    public Boolean getPersonal() {
+        return isPersonal;
+    }
+
+    public void setPersonal(Boolean personal) {
+        isPersonal = personal;
+    }
+
+    public String getNextOffset() {
+        return nextOffset;
+    }
+
+    public void setNextOffset(String nextOffset) {
+        this.nextOffset = nextOffset;
+    }
+
+    @Override
+    public JSONObject toJson() {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put(INLINEQUERYID_FIELD, inlineQueryId);
+        JSONArray JSONResults = new JSONArray();
+        for (InlineQueryResult result: results) {
+            JSONResults.put(result.toJson());
+        }
+        jsonObject.put(RESULTS_FIELD, JSONResults);
+        if (cacheTime != null) {
+            jsonObject.put(CACHETIME_FIELD, cacheTime);
+        }
+        if (isPersonal != null) {
+            jsonObject.put(ISPERSONAL_FIELD, isPersonal);
+        }
+        if (nextOffset != null) {
+            jsonObject.put(NEXTOFFSET_FIELD, nextOffset);
+        }
+        return jsonObject;
+    }
+
+    @Override
+    public String getPath() {
+        return PATH;
+    }
+
+    @Override
+    public Boolean deserializeResponse(JSONObject answer) {
+        if (answer.getBoolean("ok")) {
+            return answer.getBoolean("result");
+        }
+        return null;
+    }
+
+    @Override
+    public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        gen.writeStartObject();
+        gen.writeStringField(METHOD_FIELD, PATH);
+        gen.writeArrayFieldStart(RESULTS_FIELD);
+        for (InlineQueryResult result: results) {
+            gen.writeObject(result);
+        }
+        gen.writeEndArray();
+        if (cacheTime != null) {
+            gen.writeNumberField(CACHETIME_FIELD, cacheTime);
+        }
+        if (isPersonal != null) {
+            gen.writeBooleanField(ISPERSONAL_FIELD, isPersonal);
+        }
+        if (nextOffset != null) {
+            gen.writeStringField(NEXTOFFSET_FIELD, nextOffset);
+        }
+
+        gen.writeEndObject();
+        gen.flush();
+    }
+
+    @Override
+    public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
+        serialize(gen, serializers);
+    }
+}
diff --git a/src/main/java/org/telegram/api/objects/ChosenInlineQuery.java b/src/main/java/org/telegram/api/objects/ChosenInlineQuery.java
new file mode 100644
index 0000000..c7d7d66
--- /dev/null
+++ b/src/main/java/org/telegram/api/objects/ChosenInlineQuery.java
@@ -0,0 +1,66 @@
+package org.telegram.api.objects;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import org.json.JSONObject;
+import org.telegram.api.interfaces.BotApiObject;
+
+import java.io.IOException;
+
+/**
+ * @author Ruben Bermudez
+ * @version 1.0
+ * @brief This object represents a result of an inline query that was chosen by the user and sent to their chat partner.
+ * @date 01 of January of 2016
+ */
+public class ChosenInlineQuery implements BotApiObject {
+    public static final String RESULTID_FIELD = "id";
+    @JsonProperty(RESULTID_FIELD)
+    private String resultId; ///< The unique identifier for the result that was chosen.
+    public static final String FROM_FIELD = "from";
+    @JsonProperty(FROM_FIELD)
+    private User from; ///< The user that chose the result.
+    public static final String QUERY_FIELD = "query";
+    @JsonProperty(QUERY_FIELD)
+    private String query; ///< The query that was used to obtain the result.
+
+    public ChosenInlineQuery() {
+        super();
+    }
+
+    public ChosenInlineQuery(JSONObject jsonObject) {
+        super();
+        this.resultId = jsonObject.getString(RESULTID_FIELD);
+        this.from = new User(jsonObject.getJSONObject(FROM_FIELD));
+        this.query = jsonObject.getString(QUERY_FIELD);
+    }
+
+    public String getResultId() {
+        return resultId;
+    }
+
+    public User getFrom() {
+        return from;
+    }
+
+    public String getQuery() {
+        return query;
+    }
+
+    @Override
+    public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        gen.writeStartObject();
+        gen.writeStringField(RESULTID_FIELD, resultId);
+        gen.writeObjectField(FROM_FIELD, from);
+        gen.writeStringField(QUERY_FIELD, query);
+        gen.writeEndObject();
+        gen.flush();
+    }
+
+    @Override
+    public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
+        serialize(gen, serializers);
+    }
+}
diff --git a/src/main/java/org/telegram/api/objects/InlineQuery.java b/src/main/java/org/telegram/api/objects/InlineQuery.java
new file mode 100644
index 0000000..0a6f3a4
--- /dev/null
+++ b/src/main/java/org/telegram/api/objects/InlineQuery.java
@@ -0,0 +1,76 @@
+package org.telegram.api.objects;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import org.json.JSONObject;
+import org.telegram.api.interfaces.BotApiObject;
+
+import java.io.IOException;
+
+/**
+ * @author Ruben Bermudez
+ * @version 1.0
+ * @brief This object represents an incoming inline query.
+ * When the user sends an empty query, your bot could return some default or trending results.
+ * @date 01 of January of 2016
+ */
+public class InlineQuery implements BotApiObject {
+    public static final String ID_FIELD = "id";
+    @JsonProperty(ID_FIELD)
+    private String id; ///< Unique identifier for this query
+    public static final String FROM_FIELD = "from";
+    @JsonProperty(FROM_FIELD)
+    private User from; ///< Sender
+    public static final String QUERY_FIELD = "query";
+    @JsonProperty(QUERY_FIELD)
+    private String query; ///< Text of the query
+    public static final String OFFSET_FIELD = "offset";
+    @JsonProperty(OFFSET_FIELD)
+    private String offset; ///< Offset of the results to be returned, can be controlled by the bot
+
+    public InlineQuery() {
+        super();
+    }
+
+    public InlineQuery(JSONObject jsonObject) {
+        super();
+        this.id = jsonObject.getString(ID_FIELD);
+        this.from = new User(jsonObject.getJSONObject(FROM_FIELD));
+        this.query = jsonObject.getString(QUERY_FIELD);
+        this.offset = jsonObject.getString(OFFSET_FIELD);
+    }
+
+    @Override
+    public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        gen.writeStartObject();
+        gen.writeStringField(ID_FIELD, id);
+        gen.writeObjectField(FROM_FIELD, from);
+        gen.writeStringField(QUERY_FIELD, query);
+        gen.writeStringField(OFFSET_FIELD, offset);
+        gen.writeEndObject();
+        gen.flush();
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public User getFrom() {
+        return from;
+    }
+
+    public String getQuery() {
+        return query;
+    }
+
+    public String getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
+        serialize(gen, serializers);
+    }
+}
diff --git a/src/main/java/org/telegram/api/objects/InlineQueryResult.java b/src/main/java/org/telegram/api/objects/InlineQueryResult.java
new file mode 100644
index 0000000..8040a19
--- /dev/null
+++ b/src/main/java/org/telegram/api/objects/InlineQueryResult.java
@@ -0,0 +1,13 @@
+package org.telegram.api.objects;
+
+import org.telegram.api.interfaces.BotApiObject;
+import org.telegram.api.interfaces.IToJson;
+
+/**
+ * @author Ruben Bermudez
+ * @version 1.0
+ * @brief This object represents one result of an inline query.
+ * @date 01 of January of 2016
+ */
+public interface InlineQueryResult extends BotApiObject, IToJson {
+}
diff --git a/src/main/java/org/telegram/api/objects/InlineQueryResultArticle.java b/src/main/java/org/telegram/api/objects/InlineQueryResultArticle.java
new file mode 100644
index 0000000..b14b148
--- /dev/null
+++ b/src/main/java/org/telegram/api/objects/InlineQueryResultArticle.java
@@ -0,0 +1,233 @@
+package org.telegram.api.objects;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+/**
+ * @author Ruben Bermudez
+ * @version 1.0
+ * @brief Represents a link to an article or web page.
+ * @date 01 of January of 2016
+ */
+public class InlineQueryResultArticle implements InlineQueryResult {
+
+    public static final String TYPE_FIELD = "type";
+    @JsonProperty(TYPE_FIELD)
+    private final String type = "article"; ///< Type of the result, must be “article”
+    public static final String ID_FIELD = "id";
+    @JsonProperty(ID_FIELD)
+    private String id; ///< Unique identifier of this result
+    public static final String TITLE_FIELD = "title";
+    @JsonProperty(TITLE_FIELD)
+    private String title; ///< Title of the result
+    public static final String MESSAGETEXT_FIELD = "message_text";
+    @JsonProperty(MESSAGETEXT_FIELD)
+    private String messageText; ///< Text of a message to be sent
+    public static final String PARSEMODE_FIELD = "parse_mode";
+    @JsonProperty(PARSEMODE_FIELD)
+    private String parseMode; ///< Optional. Send “Markdown”, if you want Telegram apps to show bold, italic and inline URLs in your bot's message.
+    public static final String DISABLEWEBPAGEPREVIEW_FIELD = "disable_web_page_preview";
+    @JsonProperty(DISABLEWEBPAGEPREVIEW_FIELD)
+    private Boolean disableWebPagePreview; ///< Optional. Disables link previews for links in the sent message
+    public static final String URL_FIELD = "url";
+    @JsonProperty(URL_FIELD)
+    private String url; ///< Optional. URL of the result
+    public static final String HIDEURL_FIELD = "hide_url";
+    @JsonProperty(HIDEURL_FIELD)
+    private Boolean hideUrl; ///< Optional. Pass True, if you don't want the URL to be shown in the message
+    public static final String DESCRIPTION_FIELD = "description";
+    @JsonProperty(DESCRIPTION_FIELD)
+    private String description; ///< Optional. Short description of the result
+    public static final String THUMBURL_FIELD = "thumb_url";
+    @JsonProperty(THUMBURL_FIELD)
+    private String thumbUrl; ///< Optional. Url of the thumbnail for the result
+    public static final String THUMBWIDTH_FIELD = "thumb_width";
+    @JsonProperty(THUMBWIDTH_FIELD)
+    private Integer thumbWidth; ///< Optional. Thumbnail width
+    public static final String THUMBHEIGHT_FIELD = "thumb_height";
+    @JsonProperty(THUMBHEIGHT_FIELD)
+    private Integer thumbHeight; ///< Optional. Thumbnail height
+
+    public String getType() {
+        return type;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getMessageText() {
+        return messageText;
+    }
+
+    public void setMessageText(String messageText) {
+        this.messageText = messageText;
+    }
+
+    public String getParseMode() {
+        return parseMode;
+    }
+
+    public void setParseMode(String parseMode) {
+        this.parseMode = parseMode;
+    }
+
+    public void setMarkdown(boolean enabled) {
+        if (enabled) {
+            parseMode = "Markdown";
+        } else {
+            parseMode = null;
+        }
+    }
+
+    public Boolean getDisableWebPagePreview() {
+        return disableWebPagePreview;
+    }
+
+    public void setDisableWebPagePreview(Boolean disableWebPagePreview) {
+        this.disableWebPagePreview = disableWebPagePreview;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public Boolean getHideUrl() {
+        return hideUrl;
+    }
+
+    public void setHideUrl(Boolean hideUrl) {
+        this.hideUrl = hideUrl;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getThumbUrl() {
+        return thumbUrl;
+    }
+
+    public void setThumbUrl(String thumbUrl) {
+        this.thumbUrl = thumbUrl;
+    }
+
+    public Integer getThumbWidth() {
+        return thumbWidth;
+    }
+
+    public void setThumbWidth(Integer thumbWidth) {
+        this.thumbWidth = thumbWidth;
+    }
+
+    public Integer getThumbHeight() {
+        return thumbHeight;
+    }
+
+    public void setThumbHeight(Integer thumbHeight) {
+        this.thumbHeight = thumbHeight;
+    }
+
+    @Override
+    public JSONObject toJson() {
+        JSONObject jsonObject = new JSONObject();
+
+        jsonObject.put(TYPE_FIELD, this.type);
+        jsonObject.put(ID_FIELD, this.id);
+        jsonObject.put(TITLE_FIELD, this.title);
+        jsonObject.put(MESSAGETEXT_FIELD, this.messageText);
+        if (parseMode != null) {
+            jsonObject.put(PARSEMODE_FIELD, this.parseMode);
+        }
+        if (disableWebPagePreview != null) {
+            jsonObject.put(DISABLEWEBPAGEPREVIEW_FIELD, this.disableWebPagePreview);
+        }
+        if (url != null) {
+            jsonObject.put(URL_FIELD, this.url);
+        }
+        if (hideUrl != null) {
+            jsonObject.put(HIDEURL_FIELD, this.hideUrl);
+        }
+        if (description != null) {
+            jsonObject.put(DESCRIPTION_FIELD, this.description);
+        }
+        if (thumbUrl != null) {
+            jsonObject.put(THUMBURL_FIELD, this.thumbUrl);
+        }
+        if (thumbWidth != null) {
+            jsonObject.put(THUMBWIDTH_FIELD, this.thumbWidth);
+        }
+        if (thumbHeight != null) {
+            jsonObject.put(THUMBHEIGHT_FIELD, this.thumbHeight);
+        }
+
+        return jsonObject;
+    }
+
+    @Override
+    public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        gen.writeStartObject();
+        gen.writeStringField(TYPE_FIELD, type);
+        gen.writeStringField(ID_FIELD, id);
+        gen.writeStringField(TITLE_FIELD, title);
+        gen.writeStringField(MESSAGETEXT_FIELD, messageText);
+
+        if (parseMode != null) {
+            gen.writeStringField(PARSEMODE_FIELD, this.parseMode);
+        }
+        if (disableWebPagePreview != null) {
+            gen.writeBooleanField(DISABLEWEBPAGEPREVIEW_FIELD, this.disableWebPagePreview);
+        }
+        if (url != null) {
+            gen.writeStringField(URL_FIELD, this.url);
+        }
+        if (hideUrl != null) {
+            gen.writeBooleanField(HIDEURL_FIELD, this.hideUrl);
+        }
+        if (description != null) {
+            gen.writeStringField(DESCRIPTION_FIELD, this.description);
+        }
+        if (thumbUrl != null) {
+            gen.writeStringField(THUMBURL_FIELD, this.thumbUrl);
+        }
+        if (thumbWidth != null) {
+            gen.writeNumberField(THUMBWIDTH_FIELD, this.thumbWidth);
+        }
+        if (thumbHeight != null) {
+            gen.writeNumberField(THUMBHEIGHT_FIELD, this.thumbHeight);
+        }
+
+        gen.writeEndObject();
+        gen.flush();
+    }
+
+    @Override
+    public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
+        serialize(gen, serializers);
+    }
+}
diff --git a/src/main/java/org/telegram/api/objects/InlineQueryResultGif.java b/src/main/java/org/telegram/api/objects/InlineQueryResultGif.java
new file mode 100644
index 0000000..af3a82d
--- /dev/null
+++ b/src/main/java/org/telegram/api/objects/InlineQueryResultGif.java
@@ -0,0 +1,213 @@
+package org.telegram.api.objects;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+/**
+ * @author Ruben Bermudez
+ * @version 1.0
+ * @brief Represents a link to an animated GIF file. By default, this animated GIF file will be sent by the user with optional caption.
+ * Alternatively, you can provide message_text to send it instead of the animation.
+ * @date 01 of January of 2016
+ */
+public class InlineQueryResultGif implements InlineQueryResult {
+
+    public static final String TYPE_FIELD = "type";
+    @JsonProperty(TYPE_FIELD)
+    private final String type = "gif"; ///< Type of the result, must be "gif"
+    public static final String ID_FIELD = "id";
+    @JsonProperty(ID_FIELD)
+    private String id; ///< Unique identifier of this result
+    public static final String GIFURL_FIELD = "gif_url";
+    @JsonProperty(GIFURL_FIELD)
+    private String gifUrl; ///< A valid URL for the GIF file. File size must not exceed 1MB
+    public static final String GIFWIDTH_FIELD = "gif_width";
+    @JsonProperty(GIFWIDTH_FIELD)
+    private Integer gifWidth; ///< Optional. Width of the GIF
+    public static final String GIFHEIGHT_FIELD = "gif_height";
+    @JsonProperty(GIFHEIGHT_FIELD)
+    private Integer gifHeight; ///< Optional. Height of the GIF
+    public static final String THUMBURL_FIELD = "thumb_url";
+    @JsonProperty(THUMBURL_FIELD)
+    private String thumbUrl; ///< Optional. URL of a static thumbnail for the result (jpeg or gif)
+    public static final String TITLE_FIELD = "title";
+    @JsonProperty(TITLE_FIELD)
+    private String title; ///< Optional. Title for the result
+    public static final String CAPTION_FIELD = "caption";
+    @JsonProperty(CAPTION_FIELD)
+    private String caption; ///< Optional. Caption of the GIF file to be sent
+    public static final String MESSAGETEXT_FIELD = "message_text";
+    @JsonProperty(MESSAGETEXT_FIELD)
+    private String messageText; ///< Optional. Text of a message to be sent instead of the animation
+    public static final String PARSEMODE_FIELD = "parse_mode";
+    @JsonProperty(PARSEMODE_FIELD)
+    private String parseMode; ///< Optional. Send “Markdown”, if you want Telegram apps to show bold, italic and inline URLs in your bot's message.
+    public static final String DISABLEWEBPAGEPREVIEW_FIELD = "disable_web_page_preview";
+    @JsonProperty(DISABLEWEBPAGEPREVIEW_FIELD)
+    private Boolean disableWebPagePreview; ///< Optional. Disables link previews for links in the sent message
+
+    public String getType() {
+        return type;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getMessageText() {
+        return messageText;
+    }
+
+    public void setMessageText(String messageText) {
+        this.messageText = messageText;
+    }
+
+    public String getParseMode() {
+        return parseMode;
+    }
+
+    public void setParseMode(String parseMode) {
+        this.parseMode = parseMode;
+    }
+
+    public Boolean getDisableWebPagePreview() {
+        return disableWebPagePreview;
+    }
+
+    public void setDisableWebPagePreview(Boolean disableWebPagePreview) {
+        this.disableWebPagePreview = disableWebPagePreview;
+    }
+
+    public String getGifUrl() {
+        return gifUrl;
+    }
+
+    public void setGifUrl(String gifUrl) {
+        this.gifUrl = gifUrl;
+    }
+
+    public Integer getGifWidth() {
+        return gifWidth;
+    }
+
+    public void setGifWidth(Integer gifWidth) {
+        this.gifWidth = gifWidth;
+    }
+
+    public Integer getGifHeight() {
+        return gifHeight;
+    }
+
+    public void setGifHeight(Integer gifHeight) {
+        this.gifHeight = gifHeight;
+    }
+
+    public String getThumbUrl() {
+        return thumbUrl;
+    }
+
+    public void setThumbUrl(String thumbUrl) {
+        this.thumbUrl = thumbUrl;
+    }
+
+    public String getCaption() {
+        return caption;
+    }
+
+    public void setCaption(String caption) {
+        this.caption = caption;
+    }
+
+    @Override
+    public JSONObject toJson() {
+        JSONObject jsonObject = new JSONObject();
+
+        jsonObject.put(TYPE_FIELD, this.type);
+        jsonObject.put(ID_FIELD, this.id);
+        jsonObject.put(GIFURL_FIELD, this.gifUrl);
+        if (parseMode != null) {
+            jsonObject.put(PARSEMODE_FIELD, this.parseMode);
+        }
+        if (disableWebPagePreview != null) {
+            jsonObject.put(DISABLEWEBPAGEPREVIEW_FIELD, this.disableWebPagePreview);
+        }
+        if (gifWidth != null) {
+            jsonObject.put(GIFWIDTH_FIELD, this.gifWidth);
+        }
+        if (gifHeight != null) {
+            jsonObject.put(GIFHEIGHT_FIELD, this.gifHeight);
+        }
+        if (thumbUrl != null) {
+            jsonObject.put(THUMBURL_FIELD, this.thumbUrl);
+        }
+        if (title != null) {
+            jsonObject.put(TITLE_FIELD, this.title);
+        }
+        if (caption != null) {
+            jsonObject.put(CAPTION_FIELD, this.caption);
+        }
+        if (messageText != null) {
+            jsonObject.put(MESSAGETEXT_FIELD, this.messageText);
+        }
+
+        return jsonObject;
+    }
+
+    @Override
+    public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        gen.writeStartObject();
+        gen.writeStringField(TYPE_FIELD, type);
+        gen.writeStringField(ID_FIELD, id);
+        gen.writeStringField(GIFURL_FIELD, this.gifUrl);
+
+        if (parseMode != null) {
+            gen.writeStringField(PARSEMODE_FIELD, this.parseMode);
+        }
+        if (disableWebPagePreview != null) {
+            gen.writeBooleanField(DISABLEWEBPAGEPREVIEW_FIELD, this.disableWebPagePreview);
+        }
+        if (gifWidth != null) {
+            gen.writeNumberField(GIFWIDTH_FIELD, this.gifWidth);
+        }
+        if (gifHeight != null) {
+            gen.writeNumberField(GIFHEIGHT_FIELD, this.gifHeight);
+        }
+        if (thumbUrl != null) {
+            gen.writeStringField(THUMBURL_FIELD, this.thumbUrl);
+        }
+        if (title != null) {
+            gen.writeStringField(TITLE_FIELD, this.title);
+        }
+        if (caption != null) {
+            gen.writeStringField(CAPTION_FIELD, this.caption);
+        }
+        if (messageText != null) {
+            gen.writeStringField(MESSAGETEXT_FIELD, this.messageText);
+        }
+
+        gen.writeEndObject();
+        gen.flush();
+    }
+
+    @Override
+    public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
+        serialize(gen, serializers);
+    }
+}
diff --git a/src/main/java/org/telegram/api/objects/InlineQueryResultMpeg4Gif.java b/src/main/java/org/telegram/api/objects/InlineQueryResultMpeg4Gif.java
new file mode 100644
index 0000000..955650c
--- /dev/null
+++ b/src/main/java/org/telegram/api/objects/InlineQueryResultMpeg4Gif.java
@@ -0,0 +1,214 @@
+package org.telegram.api.objects;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+/**
+ * @author Ruben Bermudez
+ * @version 1.0
+ * @brief Represents a link to a video animation (H.264/MPEG-4 AVC video without sound).
+ * By default, this animated MPEG-4 file will be sent by the user with optional caption.
+ * Alternatively, you can provide message_text to send it instead of the animation.
+ * @date 01 of January of 2016
+ */
+public class InlineQueryResultMpeg4Gif implements InlineQueryResult {
+
+    public static final String TYPE_FIELD = "type";
+    @JsonProperty(TYPE_FIELD)
+    private final String type = "mpeg4_gif"; ///< Type of the result, must be "mpeg4_gif"
+    public static final String ID_FIELD = "id";
+    @JsonProperty(ID_FIELD)
+    private String id; ///< Unique identifier of this result
+    public static final String MPEG4URL_FIELD = "mpeg4_url";
+    @JsonProperty(MPEG4URL_FIELD)
+    private String mpeg4Url; ///< A valid URL for the MP4 file. File size must not exceed 1MB
+    public static final String MPEG4WIDTH_FIELD = "mpeg4_width";
+    @JsonProperty(MPEG4WIDTH_FIELD)
+    private Integer mpeg4Width; ///< Optional. Video width
+    public static final String MPEG4HEIGHT_FIELD = "mpeg4_height";
+    @JsonProperty(MPEG4HEIGHT_FIELD)
+    private Integer mpeg4Height; ///< Optional. Video height
+    public static final String THUMBURL_FIELD = "thumb_url";
+    @JsonProperty(THUMBURL_FIELD)
+    private String thumbUrl; ///< Optional. URL of the static thumbnail (jpeg or gif) for the result
+    public static final String TITLE_FIELD = "title";
+    @JsonProperty(TITLE_FIELD)
+    private String title; ///< Optional. Title for the result
+    public static final String CAPTION_FIELD = "caption";
+    @JsonProperty(CAPTION_FIELD)
+    private String caption; ///< Optional. Caption of the MPEG-4 file to be sent
+    public static final String MESSAGETEXT_FIELD = "message_text";
+    @JsonProperty(MESSAGETEXT_FIELD)
+    private String messageText; ///< Optional. Text of a message to be sent instead of the animation
+    public static final String PARSEMODE_FIELD = "parse_mode";
+    @JsonProperty(PARSEMODE_FIELD)
+    private String parseMode; ///< Optional. Send “Markdown”, if you want Telegram apps to show bold, italic and inline URLs in your bot's message.
+    public static final String DISABLEWEBPAGEPREVIEW_FIELD = "disable_web_page_preview";
+    @JsonProperty(DISABLEWEBPAGEPREVIEW_FIELD)
+    private Boolean disableWebPagePreview; ///< Optional. Disables link previews for links in the sent message
+
+    public String getType() {
+        return type;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getMessageText() {
+        return messageText;
+    }
+
+    public void setMessageText(String messageText) {
+        this.messageText = messageText;
+    }
+
+    public String getParseMode() {
+        return parseMode;
+    }
+
+    public void setParseMode(String parseMode) {
+        this.parseMode = parseMode;
+    }
+
+    public Boolean getDisableWebPagePreview() {
+        return disableWebPagePreview;
+    }
+
+    public void setDisableWebPagePreview(Boolean disableWebPagePreview) {
+        this.disableWebPagePreview = disableWebPagePreview;
+    }
+
+    public String getMpeg4Url() {
+        return mpeg4Url;
+    }
+
+    public void setMpeg4Url(String mpeg4Url) {
+        this.mpeg4Url = mpeg4Url;
+    }
+
+    public Integer getMpeg4Width() {
+        return mpeg4Width;
+    }
+
+    public void setMpeg4Width(Integer mpeg4Width) {
+        this.mpeg4Width = mpeg4Width;
+    }
+
+    public Integer getMpeg4Height() {
+        return mpeg4Height;
+    }
+
+    public void setMpeg4Height(Integer mpeg4Height) {
+        this.mpeg4Height = mpeg4Height;
+    }
+
+    public String getThumbUrl() {
+        return thumbUrl;
+    }
+
+    public void setThumbUrl(String thumbUrl) {
+        this.thumbUrl = thumbUrl;
+    }
+
+    public String getCaption() {
+        return caption;
+    }
+
+    public void setCaption(String caption) {
+        this.caption = caption;
+    }
+
+    @Override
+    public JSONObject toJson() {
+        JSONObject jsonObject = new JSONObject();
+
+        jsonObject.put(TYPE_FIELD, this.type);
+        jsonObject.put(ID_FIELD, this.id);
+        jsonObject.put(MPEG4URL_FIELD, this.mpeg4Url);
+        if (parseMode != null) {
+            jsonObject.put(PARSEMODE_FIELD, this.parseMode);
+        }
+        if (disableWebPagePreview != null) {
+            jsonObject.put(DISABLEWEBPAGEPREVIEW_FIELD, this.disableWebPagePreview);
+        }
+        if (mpeg4Width != null) {
+            jsonObject.put(MPEG4WIDTH_FIELD, this.mpeg4Width);
+        }
+        if (mpeg4Height != null) {
+            jsonObject.put(MPEG4HEIGHT_FIELD, this.mpeg4Height);
+        }
+        if (thumbUrl != null) {
+            jsonObject.put(THUMBURL_FIELD, this.thumbUrl);
+        }
+        if (title != null) {
+            jsonObject.put(TITLE_FIELD, this.title);
+        }
+        if (caption != null) {
+            jsonObject.put(CAPTION_FIELD, this.caption);
+        }
+        if (messageText != null) {
+            jsonObject.put(MESSAGETEXT_FIELD, this.messageText);
+        }
+
+        return jsonObject;
+    }
+
+    @Override
+    public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        gen.writeStartObject();
+        gen.writeStringField(TYPE_FIELD, type);
+        gen.writeStringField(ID_FIELD, id);
+        gen.writeStringField(MPEG4URL_FIELD, this.mpeg4Url);
+
+        if (parseMode != null) {
+            gen.writeStringField(PARSEMODE_FIELD, this.parseMode);
+        }
+        if (disableWebPagePreview != null) {
+            gen.writeBooleanField(DISABLEWEBPAGEPREVIEW_FIELD, this.disableWebPagePreview);
+        }
+        if (mpeg4Width != null) {
+            gen.writeNumberField(MPEG4WIDTH_FIELD, this.mpeg4Width);
+        }
+        if (mpeg4Height != null) {
+            gen.writeNumberField(MPEG4HEIGHT_FIELD, this.mpeg4Height);
+        }
+        if (thumbUrl != null) {
+            gen.writeStringField(THUMBURL_FIELD, this.thumbUrl);
+        }
+        if (title != null) {
+            gen.writeStringField(TITLE_FIELD, this.title);
+        }
+        if (caption != null) {
+            gen.writeStringField(CAPTION_FIELD, this.caption);
+        }
+        if (messageText != null) {
+            gen.writeStringField(MESSAGETEXT_FIELD, this.messageText);
+        }
+
+        gen.writeEndObject();
+        gen.flush();
+    }
+
+    @Override
+    public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
+        serialize(gen, serializers);
+    }
+}
diff --git a/src/main/java/org/telegram/api/objects/InlineQueryResultPhoto.java b/src/main/java/org/telegram/api/objects/InlineQueryResultPhoto.java
new file mode 100644
index 0000000..d20cd40
--- /dev/null
+++ b/src/main/java/org/telegram/api/objects/InlineQueryResultPhoto.java
@@ -0,0 +1,249 @@
+package org.telegram.api.objects;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+/**
+ * @author Ruben Bermudez
+ * @version 1.0
+ * @brief Represents a link to a photo. By default, this photo will be sent by the user with optional caption.
+ * Alternatively, you can provide message_text to send it instead of photo.
+ * @date 01 of January of 2016
+ */
+public class InlineQueryResultPhoto implements InlineQueryResult {
+
+    public static final String TYPE_FIELD = "type";
+    @JsonProperty(TYPE_FIELD)
+    private final String type = "photo"; ///< Type of the result, must be “photo”
+    public static final String ID_FIELD = "id";
+    @JsonProperty(ID_FIELD)
+    private String id; ///< Unique identifier of this result
+    public static final String PHOTOURL_FIELD = "photo_url";
+    @JsonProperty(PHOTOURL_FIELD)
+    private String photoUrl; ///< A valid URL of the photo. Photo size must not exceed 5MB
+    public static final String MIMETYPE_FIELD = "mime_type";
+    @JsonProperty(MIMETYPE_FIELD)
+    private String mimeType; ///< Optional. MIME type of the photo, defaults to image/jpeg
+    public static final String PHOTOWIDTH_FIELD = "photo_width";
+    @JsonProperty(PHOTOWIDTH_FIELD)
+    private Integer photoWidth; ///< Optional. Width of the photo
+    public static final String PHOTOHEIGHT_FIELD = "photo_height";
+    @JsonProperty(PHOTOHEIGHT_FIELD)
+    private Integer photoHeight; ///< Optional. Height of the photo
+    public static final String THUMBURL_FIELD = "thumb_url";
+    @JsonProperty(THUMBURL_FIELD)
+    private String thumbUrl; ///< Optional. URL of the thumbnail for the photo
+    public static final String TITLE_FIELD = "title";
+    @JsonProperty(TITLE_FIELD)
+    private String title; ///< Optional. Title for the result
+    public static final String DESCRIPTION_FIELD = "description";
+    @JsonProperty(DESCRIPTION_FIELD)
+    private String description; ///< Optional. Short description of the result
+    public static final String CAPTION_FIELD = "caption";
+    @JsonProperty(CAPTION_FIELD)
+    private String caption; ///< Optional. Caption of the photo to be sent
+    public static final String MESSAGETEXT_FIELD = "message_text";
+    @JsonProperty(MESSAGETEXT_FIELD)
+    private String messageText; ///< Optional. Text of a message to be sent instead of the photo
+    public static final String PARSEMODE_FIELD = "parse_mode";
+    @JsonProperty(PARSEMODE_FIELD)
+    private String parseMode; ///< Optional. Send “Markdown”, if you want Telegram apps to show bold, italic and inline URLs in your bot's message.
+    public static final String DISABLEWEBPAGEPREVIEW_FIELD = "disable_web_page_preview";
+    @JsonProperty(DISABLEWEBPAGEPREVIEW_FIELD)
+    private Boolean disableWebPagePreview; ///< Optional. Disables link previews for links in the sent message
+
+    public String getType() {
+        return type;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getMessageText() {
+        return messageText;
+    }
+
+    public void setMessageText(String messageText) {
+        this.messageText = messageText;
+    }
+
+    public String getParseMode() {
+        return parseMode;
+    }
+
+    public void setParseMode(String parseMode) {
+        this.parseMode = parseMode;
+    }
+
+    public Boolean getDisableWebPagePreview() {
+        return disableWebPagePreview;
+    }
+
+    public void setDisableWebPagePreview(Boolean disableWebPagePreview) {
+        this.disableWebPagePreview = disableWebPagePreview;
+    }
+
+    public String getPhotoUrl() {
+        return photoUrl;
+    }
+
+    public void setPhotoUrl(String photoUrl) {
+        this.photoUrl = photoUrl;
+    }
+
+    public String getMimeType() {
+        return mimeType;
+    }
+
+    public void setMimeType(String mimeType) {
+        this.mimeType = mimeType;
+    }
+
+    public Integer getPhotoWidth() {
+        return photoWidth;
+    }
+
+    public void setPhotoWidth(Integer photoWidth) {
+        this.photoWidth = photoWidth;
+    }
+
+    public Integer getPhotoHeight() {
+        return photoHeight;
+    }
+
+    public void setPhotoHeight(Integer photoHeight) {
+        this.photoHeight = photoHeight;
+    }
+
+    public String getThumbUrl() {
+        return thumbUrl;
+    }
+
+    public void setThumbUrl(String thumbUrl) {
+        this.thumbUrl = thumbUrl;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getCaption() {
+        return caption;
+    }
+
+    public void setCaption(String caption) {
+        this.caption = caption;
+    }
+
+    @Override
+    public JSONObject toJson() {
+        JSONObject jsonObject = new JSONObject();
+
+        jsonObject.put(TYPE_FIELD, this.type);
+        jsonObject.put(ID_FIELD, this.id);
+        jsonObject.put(PHOTOURL_FIELD, this.photoUrl);
+        if (parseMode != null) {
+            jsonObject.put(PARSEMODE_FIELD, this.parseMode);
+        }
+        if (disableWebPagePreview != null) {
+            jsonObject.put(DISABLEWEBPAGEPREVIEW_FIELD, this.disableWebPagePreview);
+        }
+        if (mimeType != null) {
+            jsonObject.put(MIMETYPE_FIELD, this.mimeType);
+        }
+        if (photoWidth != null) {
+            jsonObject.put(PHOTOWIDTH_FIELD, this.photoWidth);
+        }
+        if (photoHeight != null) {
+            jsonObject.put(PHOTOHEIGHT_FIELD, this.photoHeight);
+        }
+        if (description != null) {
+            jsonObject.put(DESCRIPTION_FIELD, this.description);
+        }
+        if (thumbUrl != null) {
+            jsonObject.put(THUMBURL_FIELD, this.thumbUrl);
+        }
+        if (title != null) {
+            jsonObject.put(TITLE_FIELD, this.title);
+        }
+        if (description != null) {
+            jsonObject.put(DESCRIPTION_FIELD, this.description);
+        }
+        if (caption != null) {
+            jsonObject.put(CAPTION_FIELD, this.caption);
+        }
+        if (messageText != null) {
+            jsonObject.put(MESSAGETEXT_FIELD, this.messageText);
+        }
+
+        return jsonObject;
+    }
+
+    @Override
+    public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        gen.writeStartObject();
+        gen.writeStringField(TYPE_FIELD, type);
+        gen.writeStringField(ID_FIELD, id);
+        gen.writeStringField(PHOTOURL_FIELD, this.photoUrl);
+        if (parseMode != null) {
+            gen.writeStringField(PARSEMODE_FIELD, this.parseMode);
+        }
+        if (disableWebPagePreview != null) {
+            gen.writeBooleanField(DISABLEWEBPAGEPREVIEW_FIELD, this.disableWebPagePreview);
+        }
+        if (mimeType != null) {
+            gen.writeStringField(MIMETYPE_FIELD, this.mimeType);
+        }
+        if (photoWidth != null) {
+            gen.writeNumberField(PHOTOWIDTH_FIELD, this.photoWidth);
+        }
+        if (photoHeight != null) {
+            gen.writeNumberField(PHOTOHEIGHT_FIELD, this.photoHeight);
+        }
+        if (thumbUrl != null) {
+            gen.writeStringField(THUMBURL_FIELD, this.thumbUrl);
+        }
+        if (description != null) {
+            gen.writeStringField(DESCRIPTION_FIELD, this.description);
+        }
+        if (title != null) {
+            gen.writeStringField(TITLE_FIELD, this.title);
+        }
+        if (caption != null) {
+            gen.writeStringField(CAPTION_FIELD, this.caption);
+        }
+        if (messageText != null) {
+            gen.writeStringField(MESSAGETEXT_FIELD, this.messageText);
+        }
+
+        gen.writeEndObject();
+        gen.flush();
+    }
+
+    @Override
+    public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
+        serialize(gen, serializers);
+    }
+}
diff --git a/src/main/java/org/telegram/api/objects/InlineQueryResultVideo.java b/src/main/java/org/telegram/api/objects/InlineQueryResultVideo.java
new file mode 100644
index 0000000..a946fb8
--- /dev/null
+++ b/src/main/java/org/telegram/api/objects/InlineQueryResultVideo.java
@@ -0,0 +1,245 @@
+package org.telegram.api.objects;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+/**
+ * @author Ruben Bermudez
+ * @version 1.0
+ * @brief Represents link to a page containing an embedded video player or a video file.
+ * @date 01 of January of 2016
+ */
+public class InlineQueryResultVideo implements InlineQueryResult {
+
+    public static final String TYPE_FIELD = "type";
+    @JsonProperty(TYPE_FIELD)
+    private final String type = "video"; ///< Type of the result, must be "video"
+    public static final String ID_FIELD = "id";
+    @JsonProperty(ID_FIELD)
+    private String id; ///< Unique identifier of this result
+    public static final String MIMETYPE_FIELD = "mime_type";
+    @JsonProperty(MIMETYPE_FIELD)
+    private String mimeType; ///< Mime type of the content of video url, i.e. “text/html” or “video/mp4”
+    public static final String VIDEOURL_FIELD = "video_url";
+    @JsonProperty(VIDEOURL_FIELD)
+    private String videoUrl; ///< A valid URL for the embedded video player or video file
+    public static final String VIDEOWIDTH_FIELD = "video_width";
+    @JsonProperty(VIDEOWIDTH_FIELD)
+    private Integer videoWidth; ///< Optional. Video width
+    public static final String VIDEOHEIGHT_FIELD = "video_height";
+    @JsonProperty(VIDEOHEIGHT_FIELD)
+    private Integer videoHeight; ///< Optional. Video height
+    public static final String VIDEODURATION_FIELD = "video_duration";
+    @JsonProperty(VIDEODURATION_FIELD)
+    private Integer videoDuration; ///< Optional. Video duration in seconds
+    public static final String THUMBURL_FIELD = "thumb_url";
+    @JsonProperty(THUMBURL_FIELD)
+    private String thumbUrl; ///< Optional. URL of the thumbnail (jpeg only) for the video
+    public static final String TITLE_FIELD = "title";
+    @JsonProperty(TITLE_FIELD)
+    private String title; ///< Optional. Title for the result
+    public static final String DESCRIPTION_FIELD = "description";
+    @JsonProperty(DESCRIPTION_FIELD)
+    private String description; ///< Optional. Short description of the result
+    public static final String MESSAGETEXT_FIELD = "message_text";
+    @JsonProperty(MESSAGETEXT_FIELD)
+    private String messageText; ///< Optional. Text of a message to be sent instead of the video
+    public static final String PARSEMODE_FIELD = "parse_mode";
+    @JsonProperty(PARSEMODE_FIELD)
+    private String parseMode; ///< Optional. Send “Markdown”, if you want Telegram apps to show bold, italic and inline URLs in your bot's message.
+    public static final String DISABLEWEBPAGEPREVIEW_FIELD = "disable_web_page_preview";
+    @JsonProperty(DISABLEWEBPAGEPREVIEW_FIELD)
+    private Boolean disableWebPagePreview; ///< Optional. Disables link previews for links in the sent message
+
+    public String getType() {
+        return type;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getMessageText() {
+        return messageText;
+    }
+
+    public void setMessageText(String messageText) {
+        this.messageText = messageText;
+    }
+
+    public String getParseMode() {
+        return parseMode;
+    }
+
+    public void setParseMode(String parseMode) {
+        this.parseMode = parseMode;
+    }
+
+    public Boolean getDisableWebPagePreview() {
+        return disableWebPagePreview;
+    }
+
+    public void setDisableWebPagePreview(Boolean disableWebPagePreview) {
+        this.disableWebPagePreview = disableWebPagePreview;
+    }
+
+    public String getMimeType() {
+        return mimeType;
+    }
+
+    public void setMimeType(String mimeType) {
+        this.mimeType = mimeType;
+    }
+
+    public String getVideoUrl() {
+        return videoUrl;
+    }
+
+    public void setVideoUrl(String videoUrl) {
+        this.videoUrl = videoUrl;
+    }
+
+    public Integer getVideoWidth() {
+        return videoWidth;
+    }
+
+    public void setVideoWidth(Integer videoWidth) {
+        this.videoWidth = videoWidth;
+    }
+
+    public Integer getVideoHeight() {
+        return videoHeight;
+    }
+
+    public void setVideoHeight(Integer videoHeight) {
+        this.videoHeight = videoHeight;
+    }
+
+    public Integer getVideoDuration() {
+        return videoDuration;
+    }
+
+    public void setVideoDuration(Integer videoDuration) {
+        this.videoDuration = videoDuration;
+    }
+
+    public String getThumbUrl() {
+        return thumbUrl;
+    }
+
+    public void setThumbUrl(String thumbUrl) {
+        this.thumbUrl = thumbUrl;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    @Override
+    public JSONObject toJson() {
+        JSONObject jsonObject = new JSONObject();
+
+        jsonObject.put(TYPE_FIELD, this.type);
+        jsonObject.put(ID_FIELD, this.id);
+        jsonObject.put(VIDEOURL_FIELD, this.videoUrl);
+        if (mimeType != null) {
+            jsonObject.put(MIMETYPE_FIELD, this.mimeType);
+        }
+        if (messageText != null) {
+            jsonObject.put(MESSAGETEXT_FIELD, this.messageText);
+        }
+        if (parseMode != null) {
+            jsonObject.put(PARSEMODE_FIELD, this.parseMode);
+        }
+        if (disableWebPagePreview != null) {
+            jsonObject.put(DISABLEWEBPAGEPREVIEW_FIELD, this.disableWebPagePreview);
+        }
+        if (videoWidth != null) {
+            jsonObject.put(VIDEOWIDTH_FIELD, this.videoWidth);
+        }
+        if (videoHeight != null) {
+            jsonObject.put(VIDEOHEIGHT_FIELD, this.videoHeight);
+        }
+        if (videoDuration != null) {
+            jsonObject.put(VIDEODURATION_FIELD, this.videoDuration);
+        }
+        if (thumbUrl != null) {
+            jsonObject.put(THUMBURL_FIELD, this.thumbUrl);
+        }
+        if (title != null) {
+            jsonObject.put(TITLE_FIELD, this.title);
+        }
+        if (description != null) {
+            jsonObject.put(DESCRIPTION_FIELD, this.description);
+        }
+
+        return jsonObject;
+    }
+
+    @Override
+    public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        gen.writeStartObject();
+        gen.writeStringField(TYPE_FIELD, type);
+        gen.writeStringField(ID_FIELD, id);
+        gen.writeStringField(VIDEOURL_FIELD, this.videoUrl);
+        if (mimeType != null) {
+            gen.writeStringField(MIMETYPE_FIELD, this.mimeType);
+        }
+        if (messageText != null) {
+            gen.writeStringField(MESSAGETEXT_FIELD, this.messageText);
+        }
+        if (parseMode != null) {
+            gen.writeStringField(PARSEMODE_FIELD, this.parseMode);
+        }
+        if (disableWebPagePreview != null) {
+            gen.writeBooleanField(DISABLEWEBPAGEPREVIEW_FIELD, this.disableWebPagePreview);
+        }
+        if (videoWidth != null) {
+            gen.writeNumberField(VIDEOWIDTH_FIELD, this.videoWidth);
+        }
+        if (videoHeight != null) {
+            gen.writeNumberField(VIDEOHEIGHT_FIELD, this.videoHeight);
+        }
+        if (videoDuration != null) {
+            gen.writeNumberField(VIDEODURATION_FIELD, this.videoDuration);
+        }
+        if (thumbUrl != null) {
+            gen.writeStringField(THUMBURL_FIELD, this.thumbUrl);
+        }
+        if (title != null) {
+            gen.writeStringField(TITLE_FIELD, this.title);
+        }
+        if (description != null) {
+            gen.writeStringField(DESCRIPTION_FIELD, this.description);
+        }
+
+        gen.writeEndObject();
+        gen.flush();
+    }
+
+    @Override
+    public void serializeWithType(JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSer) throws IOException {
+        serialize(gen, serializers);
+    }
+}
diff --git a/src/main/java/org/telegram/api/objects/Update.java b/src/main/java/org/telegram/api/objects/Update.java
index f82a2e4..26c7d09 100644
--- a/src/main/java/org/telegram/api/objects/Update.java
+++ b/src/main/java/org/telegram/api/objects/Update.java
@@ -12,23 +12,27 @@ import java.io.IOException;
 /**
  * @author Ruben Bermudez
  * @version 1.0
- * @brief TODO
+ * @brief This object represents an incoming update.
+ * Only one of the optional parameters can be present in any given update.
  * @date 20 of June of 2015
  */
 public class Update implements BotApiObject {
     public static final String UPDATEID_FIELD = "update_id";
-    /**
-     * The update‘s unique identifier.
-     * Update identifiers start from a certain positive number and increase sequentially.
-     * This ID becomes especially handy if you’re using Webhooks,
-     * since it allows you to ignore repeated updates or to restore the
-     * correct update sequence, should they get out of order.
-     */
     @JsonProperty(UPDATEID_FIELD)
     private Integer updateId;
     public static final String MESSAGE_FIELD = "message";
     @JsonProperty(MESSAGE_FIELD)
     private Message message; ///< Optional. New incoming message of any kind — text, photo, sticker, etc.
+    public static final String INLINEQUERY_FIELD = "inline_query";
+    @JsonProperty(INLINEQUERY_FIELD)
+    private InlineQuery inlineQuery; ///< Optional. New incoming inline query
+    public static final String CHOSENINLINEQUERY_FIELD = "chosen_inline_result";
+    @JsonProperty(CHOSENINLINEQUERY_FIELD)
+    private ChosenInlineQuery chosenInlineQuery; ///< Optional. The result of a inline query that was chosen by a user and sent to their chat partner
+
+    /*
+    	ChosenInlineResult
+     */
 
     public Update() {
         super();
@@ -40,6 +44,12 @@ public class Update implements BotApiObject {
         if (jsonObject.has(MESSAGE_FIELD)) {
             this.message = new Message(jsonObject.getJSONObject(MESSAGE_FIELD));
         }
+        if (jsonObject.has(INLINEQUERY_FIELD)) {
+            this.inlineQuery = new InlineQuery(jsonObject.getJSONObject(INLINEQUERY_FIELD));
+        }
+        if (jsonObject.has(CHOSENINLINEQUERY_FIELD)) {
+            this.chosenInlineQuery = new ChosenInlineQuery(jsonObject.getJSONObject(CHOSENINLINEQUERY_FIELD));
+        }
     }
 
     public Integer getUpdateId() {
@@ -50,6 +60,26 @@ public class Update implements BotApiObject {
         return message;
     }
 
+    public InlineQuery getInlineQuery() {
+        return inlineQuery;
+    }
+
+    public ChosenInlineQuery getChosenInlineQuery() {
+        return chosenInlineQuery;
+    }
+
+    public boolean hasMessage() {
+        return message != null;
+    }
+
+    public boolean hasInlineQuery() {
+        return inlineQuery != null;
+    }
+
+    public boolean hasChosenInlineQuery() {
+        return chosenInlineQuery != null;
+    }
+
     @Override
     public void serialize(JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeStartObject();
@@ -57,6 +87,12 @@ public class Update implements BotApiObject {
         if (message != null) {
             gen.writeObjectField(MESSAGE_FIELD, message);
         }
+        if (inlineQuery != null) {
+            gen.writeObjectField(INLINEQUERY_FIELD, inlineQuery);
+        }
+        if (chosenInlineQuery != null) {
+            gen.writeObjectField(CHOSENINLINEQUERY_FIELD, chosenInlineQuery);
+        }
         gen.writeEndObject();
         gen.flush();
     }
diff --git a/src/main/java/org/telegram/services/BotLogger.java b/src/main/java/org/telegram/services/BotLogger.java
index 03380d0..fd180b9 100644
--- a/src/main/java/org/telegram/services/BotLogger.java
+++ b/src/main/java/org/telegram/services/BotLogger.java
@@ -6,6 +6,7 @@ import javax.validation.constraints.NotNull;
 import java.io.*;
 import java.time.LocalDateTime;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.logging.ConsoleHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -26,6 +27,7 @@ public class BotLogger {
 
     static {
         logger.setLevel(Level.ALL);
+        logger.addHandler(new ConsoleHandler());
         loggerThread.start();
         lastFileDate = LocalDateTime.now();
         if ((currentFileName == null) || (currentFileName.compareTo("") == 0)) {
diff --git a/src/main/java/org/telegram/services/RaeService.java b/src/main/java/org/telegram/services/RaeService.java
new file mode 100644
index 0000000..7272a21
--- /dev/null
+++ b/src/main/java/org/telegram/services/RaeService.java
@@ -0,0 +1,231 @@
+package org.telegram.services;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.entity.BufferedHttpEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Ruben Bermudez
+ * @version 1.0
+ * @brief Rae service
+ * @date 20 of June of 2015
+ */
+public class RaeService {
+    private static final String LOGTAG = "RAESERVICE";
+
+    private static final String BASEURL = "http://dle.rae.es/srv/"; ///< Base url for REST
+    private static final String SEARCHEXACTURL = "search?m=30&w=";
+    private static final String SEARCHWORDURL = "search?m=form&w=";
+    private static final String WORDLINKBYID = "http://dle.rae.es/?id=";
+
+
+    public List<RaeResult> getResults(String query) {
+        List<RaeResult> results = new ArrayList<>();
+
+        String completeURL;
+        try {
+            completeURL = BASEURL + SEARCHEXACTURL + URLEncoder.encode(query, "UTF-8");
+
+            CloseableHttpClient client = HttpClientBuilder.create().setSSLHostnameVerifier(new NoopHostnameVerifier()).build();
+            HttpGet request = new HttpGet(completeURL);
+
+            CloseableHttpResponse response = client.execute(request);
+            HttpEntity ht = response.getEntity();
+
+            BufferedHttpEntity buf = new BufferedHttpEntity(ht);
+            String responseString = EntityUtils.toString(buf, "UTF-8");
+
+            Document document = Jsoup.parse(responseString);
+            Element article = document.getElementsByTag("article").first();
+            String articleId = null;
+            if (article != null) {
+                articleId = article.attributes().get("id");
+            }
+            Elements elements = document.select(".j");
+
+            if (elements.isEmpty()) {
+                results = getResultsWordSearch(query);
+            } else {
+                results = getResultsFromExactMatch(elements, query, articleId);
+            }
+        } catch (IOException e) {
+            BotLogger.error(LOGTAG, e);
+        }
+
+        return results;
+    }
+
+    private List<RaeResult> getResultsWordSearch(String query) {
+        List<RaeResult> results = new ArrayList<>();
+
+        String completeURL;
+        try {
+            completeURL = BASEURL + SEARCHWORDURL + URLEncoder.encode(query, "UTF-8");
+
+            CloseableHttpClient client = HttpClientBuilder.create().setSSLHostnameVerifier(new NoopHostnameVerifier()).build();
+            HttpGet request = new HttpGet(completeURL);
+
+            CloseableHttpResponse response = client.execute(request);
+            HttpEntity ht = response.getEntity();
+
+            BufferedHttpEntity buf = new BufferedHttpEntity(ht);
+            String responseString = EntityUtils.toString(buf, "UTF-8");
+
+            Document document = Jsoup.parse(responseString);
+            Element list = document.select("body div ul").first();
+
+            if (list != null) {
+                Elements links = list.getElementsByTag("a");
+                if (!links.isEmpty()) {
+                    for (Element link : links) {
+                        List<RaeResult> partialResults = fetchWord(link.attributes().get("href"), link.text());
+                        if (!partialResults.isEmpty()) {
+                            results.addAll(partialResults);
+                        }
+                    }
+                }
+            }
+        } catch (IOException e) {
+            BotLogger.error(LOGTAG, e);
+        }
+
+        return results;
+    }
+
+    private List<RaeResult> fetchWord(String link, String word) {
+        List<RaeResult> results = new ArrayList<>();
+
+        String completeURL;
+        try {
+            completeURL = BASEURL + link;
+
+            CloseableHttpClient client = HttpClientBuilder.create().setSSLHostnameVerifier(new NoopHostnameVerifier()).build();
+            HttpGet request = new HttpGet(completeURL);
+
+            CloseableHttpResponse response = client.execute(request);
+            HttpEntity ht = response.getEntity();
+
+            BufferedHttpEntity buf = new BufferedHttpEntity(ht);
+            String responseString = EntityUtils.toString(buf, "UTF-8");
+
+            Document document = Jsoup.parse(responseString);
+            Element article = document.getElementsByTag("article").first();
+            String articleId = null;
+            if (article != null) {
+                articleId = article.attributes().get("id");
+            }
+            Elements elements = document.select(".j");
+
+            if (!elements.isEmpty()) {
+                results = getResultsFromExactMatch(elements, word, articleId);
+            }
+        } catch (IOException e) {
+            BotLogger.error(LOGTAG, e);
+        }
+
+        return results;
+    }
+
+    private List<RaeResult> getResultsFromExactMatch(Elements elements, String word, String link) {
+        List<RaeResult> results = new ArrayList<>();
+        for (int i = 0; i < elements.size(); i++) {
+            Element element = elements.get(i);
+            RaeResult result = new RaeResult();
+            if (link != null && !link.isEmpty()) {
+                result.link = WORDLINKBYID + link;
+            }
+            result.index = i;
+            result.word = capitalizeFirstLetter(word);
+            Elements tags = element.getElementsByTag("abbr");
+            tags.removeIf(x -> !x.parent().equals(element));
+            for (Element tag : tags) {
+                result.tags.put(tag.text(), tag.attributes().get("title"));
+            }
+            Elements definition = element.getElementsByTag("mark");
+            definition.removeIf(x -> !x.parent().equals(element));
+            if (definition.isEmpty()) {
+                results.addAll(findResultsFromRedirect(element, word));
+            } else {
+                StringBuilder definitionBuilder = new StringBuilder();
+                definition.stream().forEachOrdered(y -> {
+                    String partialText = y.text();
+                    if (definitionBuilder.length() > 0) {
+                        definitionBuilder.append(" ");
+                        partialText = partialText.toLowerCase();
+                    }
+                    definitionBuilder.append(partialText);
+                });
+                result.definition = capitalizeFirstLetter(definitionBuilder.toString());
+                results.add(result);
+            }
+        }
+
+        return results;
+    }
+
+    private List<RaeResult> findResultsFromRedirect(Element element, String word) {
+        List<RaeResult> results = new ArrayList<>();
+        Element redirect = element.getElementsByTag("a").first();
+        if (redirect != null) {
+            String link = redirect.attributes().get("href");
+            results = fetchWord(link, word);
+        }
+
+        return results;
+    }
+
+    private static String capitalizeFirstLetter(String original) {
+        if (original == null || original.length() == 0) {
+            return original;
+        }
+        return original.substring(0, 1).toUpperCase() + original.substring(1);
+    }
+
+    public static class RaeResult {
+        public int index;
+        public String word;
+        public Map<String, String> tags = new HashMap<>();
+        public String definition;
+        public String link;
+
+        public String getDefinition() {
+            final StringBuilder builder = new StringBuilder();
+            if (link != null && !link.isEmpty()) {
+                builder.append("[").append(word).append("](");
+                builder.append(link).append(")\n");
+            }
+            for (Map.Entry<String, String> tag : tags.entrySet()) {
+                builder.append("*").append(tag.getKey()).append("*");
+                builder.append(" (_").append(tag.getValue()).append("_)\n");
+            }
+            builder.append(definition);
+            return builder.toString();
+        }
+
+        public String getDescription() {
+            return definition;
+        }
+
+        public String getTitle() {
+            final StringBuilder builder = new StringBuilder();
+            builder.append(index).append(". ").append(word);
+            return builder.toString();
+        }
+    }
+}
diff --git a/src/main/java/org/telegram/updateshandlers/RaeHandlers.java b/src/main/java/org/telegram/updateshandlers/RaeHandlers.java
new file mode 100644
index 0000000..c5f75e3
--- /dev/null
+++ b/src/main/java/org/telegram/updateshandlers/RaeHandlers.java
@@ -0,0 +1,151 @@
+package org.telegram.updateshandlers;
+
+import org.telegram.BotConfig;
+import org.telegram.BuildVars;
+import org.telegram.SenderHelper;
+import org.telegram.api.methods.AnswerInlineQuery;
+import org.telegram.api.methods.BotApiMethod;
+import org.telegram.api.methods.SendMessage;
+import org.telegram.api.objects.*;
+import org.telegram.services.BotLogger;
+import org.telegram.services.RaeService;
+import org.telegram.updatesreceivers.UpdatesThread;
+import org.telegram.updatesreceivers.Webhook;
+
+import java.io.InvalidObjectException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Ruben Bermudez
+ * @version 1.0
+ * @brief Handler for inline queries in Raebot
+ * This is a use case that works with both Webhooks and GetUpdates methods
+ * @date 24 of June of 2015
+ */
+public class RaeHandlers implements UpdatesCallback {
+    private static final String LOGTAG = "RAEHANDLERS";
+    private static final String TOKEN = BotConfig.TOKENRAE;
+    private static final String BOTNAME = BotConfig.USERNAMERAE;
+    private static final Integer CACHETIME = 86400;
+    private static final boolean USEWEBHOOK = true;
+    private final RaeService raeService;
+    private final Object webhookLock = new Object();
+    private final String THUMBNAILBLUE = "https://lh5.ggpht.com/-kSFHGvQkFivERzyCNgKPIECtIOELfPNWAQdXqQ7uqv2xztxqll4bVibI0oHJYAuAas=w300";
+    private static final String helpMessage = "Este bot puede ayudarte a buscar definiciones de palabras según el diccionario de la RAE.\n\n" +
+            "Funciona automáticamente, no hay necesidad de añadirlo a ningún sitio.\n" +
+            "Simplemente abre cualquiera de tus chats y escribe `@raebot loquesea` en la zona de escribir mensajes.\n" +
+            "Finalmente pulsa sobre un resultado para enviarlo." +
+            "\n\n" +
+            "Por ejemplo, intenta escribir `@raebot Punto` aquí.";
+
+    public RaeHandlers(Webhook webhook) {
+        raeService = new RaeService();
+        if (USEWEBHOOK && BuildVars.useWebHook) {
+            webhook.registerWebhook(this, BOTNAME);
+            SenderHelper.SendWebhook(Webhook.getExternalURL(BOTNAME), TOKEN);
+        } else {
+            SenderHelper.SendWebhook("", TOKEN);
+            new UpdatesThread(TOKEN, this);
+        }
+    }
+
+    @Override
+    public void onUpdateReceived(Update update) {
+        if (update.hasInlineQuery()) {
+            BotApiMethod botApiMethod = handleIncomingInlineQuery(update.getInlineQuery());
+            try {
+                SenderHelper.SendApiMethod(botApiMethod, TOKEN);
+            } catch (InvalidObjectException e) {
+                BotLogger.error(LOGTAG, e);
+            }
+        } else if (update.hasMessage() && update.getMessage().isUserMessage()) {
+            try {
+                SenderHelper.SendApiMethod(getHelpMessage(update.getMessage()), TOKEN);
+            } catch (InvalidObjectException e) {
+                BotLogger.error(LOGTAG, e);
+            }
+        }
+    }
+
+    @Override
+    public BotApiMethod onWebhookUpdateReceived(Update update) {
+        if (update.hasInlineQuery()) {
+            synchronized (webhookLock) {
+                return handleIncomingInlineQuery(update.getInlineQuery());
+            }
+        } else if (update.hasMessage() && update.getMessage().isUserMessage()) {
+            synchronized (webhookLock) {
+                return getHelpMessage(update.getMessage());
+            }
+        }
+        return null;
+    }
+
+    /**
+     * For an InlineQuery, results from RAE dictionariy are fetch and returned
+     * @param inlineQuery InlineQuery recieved
+     * @return BotApiMethod as response to the inline query
+     */
+    private BotApiMethod handleIncomingInlineQuery(InlineQuery inlineQuery) {
+        String query = inlineQuery.getQuery();
+        BotLogger.debug(LOGTAG, "Searching: " + query);
+        if (!query.isEmpty()) {
+            List<RaeService.RaeResult> results = raeService.getResults(query);
+            return converteResultsToResponse(inlineQuery, results);
+        } else {
+            return converteResultsToResponse(inlineQuery, new ArrayList<>());
+        }
+    }
+
+    /**
+     * Converts resutls from RaeService to an answer to an inline query
+     * @param inlineQuery Original inline query
+     * @param results Results from RAE service
+     * @return AnswerInlineQuery method to answer the query
+     */
+    private BotApiMethod converteResultsToResponse(InlineQuery inlineQuery, List<RaeService.RaeResult> results) {
+        AnswerInlineQuery answerInlineQuery = new AnswerInlineQuery();
+        answerInlineQuery.setInlineQueryId(inlineQuery.getId());
+        answerInlineQuery.setCacheTime(CACHETIME);
+        answerInlineQuery.setResults(convertRaeResults(results));
+        return answerInlineQuery;
+    }
+
+    /**
+     * Converts results from RaeService to a list of InlineQueryResultArticles
+     * @param raeResults Results from rae service
+     * @return List of InlineQueryResult
+     */
+    private List<InlineQueryResult> convertRaeResults(List<RaeService.RaeResult> raeResults) {
+        List<InlineQueryResult> results = new ArrayList<>();
+
+        for (int i = 0; i < raeResults.size(); i++) {
+            RaeService.RaeResult raeResult = raeResults.get(i);
+            InlineQueryResultArticle article = new InlineQueryResultArticle();
+            article.setDisableWebPagePreview(true);
+            article.setMarkdown(true);
+            article.setId(Integer.toString(i));
+            article.setMessageText(raeResult.getDefinition());
+            article.setTitle(raeResult.getTitle());
+            article.setDescription(raeResult.getDescription());
+            article.setThumbUrl(THUMBNAILBLUE);
+            results.add(article);
+        }
+
+        return results;
+    }
+
+    /**
+     * Create a help message when an user try to send messages directly to the bot
+     * @param message Received message
+     * @return SendMessage method
+     */
+    public BotApiMethod getHelpMessage(Message message) {
+        SendMessage sendMessage = new SendMessage();
+        sendMessage.setChatId(message.getChatId().toString());
+        sendMessage.enableMarkdown(true);
+        sendMessage.setText(helpMessage);
+        return sendMessage;
+    }
+}
diff --git a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
index 3ed272b..553655e 100644
--- a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
+++ b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
@@ -97,21 +97,23 @@ public class WeatherHandlers implements UpdatesCallback {
 
     @Override
     public void onUpdateReceived(Update update) {
-        Message message = update.getMessage();
-        if (message != null && (message.hasText() || message.hasLocation())) {
-            BotApiMethod botApiMethod = handleIncomingMessage(message);
-            try {
-                SenderHelper.SendApiMethod(botApiMethod, TOKEN);
-            } catch (InvalidObjectException e) {
-                BotLogger.error(LOGTAG, e);
+        if (update.hasMessage()) {
+            Message message = update.getMessage();
+            if (message.hasText() || message.hasLocation()) {
+                BotApiMethod botApiMethod = handleIncomingMessage(message);
+                try {
+                    SenderHelper.SendApiMethod(botApiMethod, TOKEN);
+                } catch (InvalidObjectException e) {
+                    BotLogger.error(LOGTAG, e);
+                }
             }
         }
     }
 
     @Override
     public BotApiMethod onWebhookUpdateReceived(Update update) {
-        Message message = update.getMessage();
-        if (message != null) {
+        if (update.hasMessage()) {
+            Message message = update.getMessage();
             synchronized (webhookLock) {
                 return handleIncomingMessage(message);
             }