diff --git a/contrib_bots/bots/weather/.weather_config b/contrib_bots/bots/weather/.weather_config
new file mode 100644
index 0000000..7fa4a44
--- /dev/null
+++ b/contrib_bots/bots/weather/.weather_config
@@ -0,0 +1,2 @@
+[weather-config]
+key=XXXXXXXX
diff --git a/contrib_bots/bots/weather/assets/screen1.png b/contrib_bots/bots/weather/assets/screen1.png
new file mode 100644
index 0000000..6e7d380
Binary files /dev/null and b/contrib_bots/bots/weather/assets/screen1.png differ
diff --git a/contrib_bots/bots/weather/assets/screen2.png b/contrib_bots/bots/weather/assets/screen2.png
new file mode 100644
index 0000000..43848ea
Binary files /dev/null and b/contrib_bots/bots/weather/assets/screen2.png differ
diff --git a/contrib_bots/bots/weather/readme.md b/contrib_bots/bots/weather/readme.md
new file mode 100644
index 0000000..d16cbba
--- /dev/null
+++ b/contrib_bots/bots/weather/readme.md
@@ -0,0 +1,16 @@
+# WeatherBot
+
+* This is a bot that sends weather information to a selected stream on
+  request.
+
+* Weather information is brought to the website using an
+OpenWeatherMap API. The bot posts the weather information to the
+stream from which the user inputs the message.  If the user inputs a
+city that does not exist, the bot displays a "Sorry, city not found"
+message.
+
+* Before using this bot, you have to generate an OpenWeatherMap API
+  key and replace the dummy value in .weather_config.
+
+![Example Usage](assets/screen1.png)
+![Wrong City](assets/screen2.png)
diff --git a/contrib_bots/bots/weather/weather.py b/contrib_bots/bots/weather/weather.py
new file mode 100644
index 0000000..935c744
--- /dev/null
+++ b/contrib_bots/bots/weather/weather.py
@@ -0,0 +1,75 @@
+# See readme.md for instructions on running this code.
+from __future__ import print_function
+import requests
+import json
+import os
+import sys
+from six.moves.configparser import SafeConfigParser
+
+
+class WeatherHandler(object):
+    def __init__(self):
+        self.directory = os.path.dirname(os.path.realpath(__file__)) + '/'
+        self.config_name = '.weather_config'
+        self.response_pattern = 'Weather in {}, {}:\n{} F / {} C\n{}'
+        if not os.path.exists(self.directory + self.config_name):
+            print('Weather bot config file not found, please set it up in {} file in this bot main directory'
+                  '\n\nUsing format:\n\n[weather-config]\nkey=<OpenWeatherMap API key here>\n\n'.format(self.config_name))
+            sys.exit(1)
+        super(WeatherHandler, self).__init__()
+
+    def usage(self):
+        return '''
+            This plugin will give info about weather in a specified city
+            '''
+
+    def handle_message(self, message, client, state_handler):
+        help_content = '''
+            This bot returns weather info for specified city.
+            You specify city in the following format:
+            city, state/country
+            state and country parameter is optional(useful when there are many cities with the same name)
+            For example:
+            @**Weather Bot** Portland
+            @**Weather Bot** Portland, Me
+            '''.strip()
+
+        if (message['content'] == 'help') or (message['content'] == ''):
+            response = help_content
+        else:
+            url = 'http://api.openweathermap.org/data/2.5/weather?q=' + message['content'] + '&APPID='
+            r = requests.get(url + get_weather_api_key_from_config(self.directory, self.config_name))
+            if "city not found" in r.text:
+                response = "Sorry, city not found"
+            else:
+                response = format_response(r.text, message['content'], self.response_pattern)
+
+        client.send_reply(message, response)
+
+
+def format_response(text, city, response_pattern):
+    j = json.loads(text)
+    city = j['name']
+    country = j['sys']['country']
+    fahrenheit = to_fahrenheit(j['main']['temp'])
+    celsius = to_celsius(j['main']['temp'])
+    description = j['weather'][0]['description'].title()
+
+    return response_pattern.format(city, country, fahrenheit, celsius, description)
+
+
+def to_celsius(temp_kelvin):
+    return int(temp_kelvin) - 273.15
+
+
+def to_fahrenheit(temp_kelvin):
+    return int(temp_kelvin) * 9 / 5 - 459.67
+
+
+def get_weather_api_key_from_config(directory, config_name):
+    config = SafeConfigParser()
+    with open(directory + config_name, 'r') as config_file:
+        config.readfp(config_file)
+    return config.get("weather-config", "key")
+
+handler_class = WeatherHandler