diff --git a/Camera.py b/Camera.py
new file mode 100644
index 0000000..095fc4d
--- /dev/null
+++ b/Camera.py
@@ -0,0 +1,123 @@
+# -*- coding: utf-8-*-
+
+import os
+import subprocess
+import time
+import sys
+
+WORDS = [u"PAIZHAO", u"ZHAOPIAN"]
+SLUG = "camera"
+
+
+def handle(text, mic, profile, wxbot=None):
+    """
+        Reports the current time based on the user's timezone.
+
+        Arguments:
+        text -- user-input, typically transcribed speech
+        mic -- used to interact with the user (for both input and output)
+        profile -- contains information related to the user (e.g., phone
+                   number)
+        wxbot -- wechat bot instance
+    """
+    sys.path.append(mic.dingdangpath.LIB_PATH)
+    from app_utils import sendToUser
+
+    quality = 100
+    count_down = 3
+    dest_path = os.path.expanduser('~/pictures')
+    vertical_flip = False
+    horizontal_flip = False
+    send_to_user = True
+    sound = True
+    usb_camera = False
+    # read config
+    if profile[SLUG] and 'enable' in profile[SLUG] and \
+       profile[SLUG]['enable']:
+        if 'count_down' in profile[SLUG] and \
+           profile[SLUG]['count_down'] > 0:
+            count_down = profile[SLUG]['count_down']
+        if 'quality' in profile[SLUG] and \
+           profile[SLUG]['quality'] > 0:
+            quality = profile[SLUG]['quality']
+        if 'dest_path' in profile[SLUG] and \
+           profile[SLUG]['dest_path'] != '':
+            dest_path = profile[SLUG]['dest_path']
+        if 'vertical_flip' in profile[SLUG] and \
+           profile[SLUG]['vertical_flip']:
+            vertical_flip = True
+        if 'horizontal_flip' in profile[SLUG] and \
+           profile[SLUG]['horizontal_flip']:
+            horizontal_flip = True
+        if 'send_to_user' in profile[SLUG] and \
+           not profile[SLUG]['send_to_user']:
+            send_to_user = False
+        if 'sound' in profile[SLUG] and \
+           not profile[SLUG]['sound']:
+            sound = False
+        if 'usb_camera' in profile[SLUG] and \
+                profile[SLUG]['usb_camera']:
+            usb_camera = True
+        if any(word in text for word in [u"安静", u"偷偷", u"悄悄"]):
+            sound = False
+        try:
+            if not os.path.exists(dest_path):
+                os.makedirs(dest_path)
+        except Exception:
+            mic.say(u"抱歉，照片目录创建失败")
+            return
+        dest_file = os.path.join(dest_path, "%s.jpg" % time.time())
+        if usb_camera:
+            command = "fswebcam --no-banner -r 1024x765 -q "
+            if vertical_flip:
+                command = command+' -s v '
+            if horizontal_flip:
+                command = command+'-s h '
+            command = command+dest_file
+        else:
+            command = ['raspistill', '-o', dest_file, '-q', str(quality)]
+            if count_down > 0 and sound:
+                command.extend(['-t', str(count_down*1000)])
+            if vertical_flip:
+                command.append('-vf')
+            if horizontal_flip:
+                command.append('-hf')
+        if sound and count_down > 0:
+            mic.say(u"收到，%d秒后启动拍照" % (count_down))
+            if usb_camera: time.sleep(count_down)
+            
+        process = subprocess.Popen(command, shell=usb_camera)
+        res = process.wait()
+        if res != 0:
+            if sound:
+                mic.say(u"拍照失败，请检查相机是否连接正确")
+            return
+        if sound:
+            mic.play(mic.dingdangpath.data('audio', 'camera.wav'))
+        # send to user
+        if send_to_user:
+            target = '邮箱'
+            if wxbot is not None and wxbot.my_account != {} and \
+               ('prefers_email' not in profile or
+               not profile['prefers_email']):
+                target = '微信'
+            if sound:
+                mic.say(u'拍照成功！正在发送照片到您的%s' % target)
+            if sendToUser(profile, wxbot, u"这是刚刚为您拍摄的照片", "", [dest_file], []):
+                if sound:
+                    mic.say(u'发送成功')
+            else:
+                if sound:
+                    mic.say(u'发送失败了')
+    else:
+        mic.say(u"请先在配置文件中开启相机拍照功能")
+
+
+def isValid(text):
+    """
+        Returns True if input is related to the time.
+
+        Arguments:
+        text -- user-input, typically transcribed speech
+    """
+    return any(word in text for word in ["拍照", "拍张照"])
diff --git a/client/plugins/Camera.py b/client/plugins/Camera.py
old mode 100644
new mode 100755
index 3a42460..64dbfbb
--- a/client/plugins/Camera.py
+++ b/client/plugins/Camera.py
@@ -30,6 +30,7 @@ def handle(text, mic, profile, wxbot=None):
     horizontal_flip = False
     send_to_user = True
     sound = True
+    usb_camera = False
     # read config
     if profile[SLUG] and 'enable' in profile[SLUG] and \
        profile[SLUG]['enable']:
@@ -54,6 +55,9 @@ def handle(text, mic, profile, wxbot=None):
         if 'sound' in profile[SLUG] and \
            not profile[SLUG]['sound']:
             sound = False
+        if 'usb_camera' in profile[SLUG] and \
+                profile[SLUG]['usb_camera']:
+            usb_camera = True
         if any(word in text for word in [u"安静", u"偷偷", u"悄悄"]):
             sound = False
         try:
@@ -63,16 +67,27 @@ def handle(text, mic, profile, wxbot=None):
             mic.say(u"抱歉，照片目录创建失败")
             return
         dest_file = os.path.join(dest_path, "%s.jpg" % time.time())
-        command = ['raspistill', '-o', dest_file, '-q', str(quality)]
-        if count_down > 0 and sound:
-            command.extend(['-t', str(count_down*1000)])
-        if vertical_flip:
-            command.append('-vf')
-        if horizontal_flip:
-            command.append('-hf')
+        if usb_camera:
+            command = "fswebcam --no-banner -r 1024x765 -q "
+            if vertical_flip:
+                command = command+' -s v '
+            if horizontal_flip:
+                command = command+'-s h '
+            command = command+dest_file
+        else:
+            command = ['raspistill', '-o', dest_file, '-q', str(quality)]
+            if count_down > 0 and sound:
+                command.extend(['-t', str(count_down*1000)])
+            if vertical_flip:
+                command.append('-vf')
+            if horizontal_flip:
+                command.append('-hf')
         if sound and count_down > 0:
-            mic.say(u"收到，%d秒后启动拍照" % count_down)
-        process = subprocess.Popen(command)
+            mic.say(u"收到，%d秒后启动拍照" % (count_down))
+            if usb_camera:
+                time.sleep(count_down)
+
+        process = subprocess.Popen(command, shell=usb_camera)
         res = process.wait()
         if res != 0:
             if sound: