diff --git a/telegram/inlinequery.py b/telegram/inlinequery.py
index 1bd9c44c8..2a9c883bf 100644
--- a/telegram/inlinequery.py
+++ b/telegram/inlinequery.py
@@ -19,7 +19,7 @@
 
 """This module contains a object that represents a Telegram InlineQuery"""
 
-from telegram import TelegramObject, User
+from telegram import TelegramObject, User, Location
 
 
 class InlineQuery(TelegramObject):
@@ -39,6 +39,10 @@ class InlineQuery(TelegramObject):
         from_user (:class:`telegram.User`):
         query (str):
         offset (str):
+        **kwargs: Arbitrary keyword arguments.
+
+    Keyword Args:
+        location (optional[:class:`telegram.Location`]):
     """
 
     def __init__(self,
@@ -53,6 +57,9 @@ class InlineQuery(TelegramObject):
         self.query = query
         self.offset = offset
 
+        # Optional
+        self.location = kwargs.get('location')
+
     @staticmethod
     def de_json(data):
         """
@@ -68,6 +75,7 @@ class InlineQuery(TelegramObject):
             return None
 
         data['from_user'] = User.de_json(data.get('from'))
+        data['location'] = Location.de_json(data.get('location'))
 
         return InlineQuery(**data)
 
diff --git a/tests/test_inlinequery.py b/tests/test_inlinequery.py
index 41af69756..4c59f86cf 100644
--- a/tests/test_inlinequery.py
+++ b/tests/test_inlinequery.py
@@ -37,17 +37,20 @@ class InlineQueryTest(BaseTest, unittest.TestCase):
 
     def setUp(self):
         user = telegram.User(1, 'First name')
+        location = telegram.Location(8.8, 53.1)
 
         self.id = 'id'
         self.from_user = user
         self.query = 'query text'
         self.offset = 'offset'
+        self.location = location
 
         self.json_dict = {
             'id': self.id,
             'from': self.from_user.to_dict(),
             'query': self.query,
-            'offset': self.offset
+            'offset': self.offset,
+            'location': self.location.to_dict()
         }
 
     def test_inlinequery_de_json(self):
@@ -56,6 +59,8 @@ class InlineQueryTest(BaseTest, unittest.TestCase):
         self.assertEqual(inlinequery.id, self.id)
         self.assertDictEqual(inlinequery.from_user.to_dict(),
                              self.from_user.to_dict())
+        self.assertDictEqual(inlinequery.location.to_dict(),
+                             self.location.to_dict())
         self.assertEqual(inlinequery.query, self.query)
         self.assertEqual(inlinequery.offset, self.offset)