From b14cf1ecd4fe8269d3a95dc02524e56a7dd39aae Mon Sep 17 00:00:00 2001
From: eternnoir <eternnoir@gmail.com>
Date: Fri, 26 Jun 2015 21:56:49 +0800
Subject: [PATCH] Add TODO to readme.

---
 README.md        | 15 +++++++++++++++
 telebot/types.py |  8 ++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 439af8d..cf0db6d 100644
--- a/README.md
+++ b/README.md
@@ -43,3 +43,18 @@ tb.polling(3)
 while True:
     time.sleep(20)
 ```
+
+## TODO
+
+- [x] getMe
+- [ ] sendMessage
+- [ ] forwardMessage
+- [ ] sendPhoto
+- [ ] sendAudio
+- [ ] sendDocument
+- [ ] sendSticker
+- [ ] sendVideo
+- [ ] sendLocation
+- [ ] sendChatAction
+- [ ] getUserProfilePhotos
+- [x] getUpdates
diff --git a/telebot/types.py b/telebot/types.py
index eb69f59..e3d3f4d 100644
--- a/telebot/types.py
+++ b/telebot/types.py
@@ -65,10 +65,10 @@ class Message:
         fromUser = User.de_json(json.dumps(obj['from']))
         chat = Message.parse_chat(obj['chat'])
         date = obj['date']
-        text = None
+        opts = {}
         if 'text' in obj:
-            text = obj['text']
-        return Message(message_id, fromUser, date, chat, text=text)
+            opts['text'] = obj['text']
+        return Message(message_id, fromUser, date, chat, opts)
 
     @classmethod
     def parse_chat(cls, chat):
@@ -77,7 +77,7 @@ class Message:
         else:
             return User.de_json(json.dumps(chat))
 
-    def __init__(self, message_id, fromUser, date, chat, **options):
+    def __init__(self, message_id, fromUser, date, chat, options):
         self.chat = chat
         self.date = date
         self.fromUser = fromUser