diff --git a/pymeasure/device/__init__.py b/pymeasure/device/__init__.py
index b38c24c..a686914 100644
--- a/pymeasure/device/__init__.py
+++ b/pymeasure/device/__init__.py
@@ -4,6 +4,7 @@
 import signalgenerator
 import powermeter
 import spectrumanalyzer
+import vacuummonitor
 
 
 
diff --git a/pymeasure/device/signalgenerator/signalgenerator.py b/pymeasure/device/signalgenerator/signalgenerator.py
index 6f4149d..e4ef6fc 100644
--- a/pymeasure/device/signalgenerator/signalgenerator.py
+++ b/pymeasure/device/signalgenerator/signalgenerator.py
@@ -91,7 +91,7 @@ def preset(self):
     def self_test(self, interval=0.2):
         wait = lambda: time.sleep(interval)
         
-        print('self_tset :: signalgenerator')
+        print('self_test :: signalgenerator')
         print('============================')
         print('model: %s'%(self.model))
         print('communicator: %s'%(self.com.method))
diff --git a/pymeasure/device/vacuum_monitor/__init__.py b/pymeasure/device/vacuum_monitor/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/pymeasure/device/vacuum_monitor/vacuum_monitor.py b/pymeasure/device/vacuum_monitor/vacuum_monitor.py
deleted file mode 100644
index ce3c446..0000000
--- a/pymeasure/device/vacuum_monitor/vacuum_monitor.py
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /usr/bin/env python
-# coding=utf-8
-
-import os.path
-import sys
-sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)),'../'))
-
-import device
-
-class vacuum_monitor(device.device):
-    api = {'pressure_get': ''}
-    pressure = None
-
-    def pressure_get(self):
-
-        self.pressure = self._pressure_get()
-        return self.pressure
-
-    def _pressure_get(self):
-
-        self.com.open()
-        self.com.send('%s¥n'%(self.api['pressure_get']))
-        pressure = float(self.com.readline())
-        self.com.close()
-        return pressure
-
-
-class dummy(vacuum_monitor):
-    pressure = None
-
-    def _pressure_get(self):
-        self.com.open()
-        self.com.send('%s¥n'%(self.api['pressure_get']))
-        self.com.close()
-        return self.pressure
diff --git a/pymeasure/device/vacuummonitor/__init__.py b/pymeasure/device/vacuummonitor/__init__.py
new file mode 100644
index 0000000..097b724
--- /dev/null
+++ b/pymeasure/device/vacuummonitor/__init__.py
@@ -0,0 +1,4 @@
+
+# pymeasure/device/vacuummonitor
+
+from vacuummonitor import dummy_client as dummy
\ No newline at end of file
diff --git a/pymeasure/device/vacuummonitor/vacuummonitor.py b/pymeasure/device/vacuummonitor/vacuummonitor.py
new file mode 100644
index 0000000..81a8b4f
--- /dev/null
+++ b/pymeasure/device/vacuummonitor/vacuummonitor.py
@@ -0,0 +1,250 @@
+#! /usr/bin/env python
+# coding=utf-8
+
+import os
+import sys
+import time
+import threading
+import socket
+
+from .. import device
+
+# ======================
+# Interface Class
+# ======================
+
+class vacuummonitor(device.device):
+    # property configuration
+    # ======================
+    press1 = 0
+    press2 = 0
+    unit = 'None'
+
+
+    # constructor
+    # ============
+    def __init__(self, com=None):
+        device.device.__init__(self, com)
+        self.measure()
+        self.unit_check()
+        self.model_check()
+        pass
+
+    # Interface method
+    # ================
+    def measure(self):
+        """
+        """
+        self.press = self._measure()
+        return self.press
+
+    def unit_set(self, unit):
+        """
+        """
+        self.unit = self._unit_set(unit)
+        return
+
+    def unit_check(self):
+        """
+        """
+        return self.unit
+
+
+    def model_check(self):
+        self.model = self._model_check()
+        return self.model
+
+
+
+    # self test
+    # =========
+    def self_test(self, interval=0.2):
+        wait = lambda: time.sleep(interval)
+
+        print('self_test :: vacuummonitor')
+        print('==========================')
+        print('model: %s'%(self.model))
+        print('communicator: %s'%(self.com.method))
+        print('--------------------------')
+
+        print('')
+        print('test start')
+        print('----------')
+        print('%-30s'%'measure():'),
+        try:
+            ret = self.measure()
+            wait()
+            if type(ret)!=list: print('!! Bad !!, return is not list')
+            elif not False in [type(a)==float for a in ret] == True: print('OK, %s'%(ret))
+        except:
+            err = sys.exc_info()
+            print('!! Error !!, %s, %s'%(err[0].__name__, err[1]))
+            pass
+
+        print('%-30s'%'unit_check():'),
+        try:
+            ret = self.unit_check()
+            wait()
+            if type(ret)!=str: print('!! Bad !!, return is not str')
+            else: print('OK, %s'%ret)
+        except:
+            err = sys.exc_info()
+            print('!! Error !!, %s %s'%(err[0].__name__, err[1]))
+            pass
+
+        print('%-30s'%"unit_set('torr'):"),
+        try:
+            self.unit_set('torr')
+            wait()
+            ret = self.unit_check()
+            if ret!='torr': print('!! Bad !!, %s'%(ret))
+            else: print('OK, %s'%ret)
+        except:
+            err = sys.exc_info()
+            print('!! Error !!, %s %s'%(err[0].__name__, err[1]))
+            pass
+
+
+
+        wait()
+
+        print('')
+        print('test end')
+        print('')
+        return
+
+
+    # internal method
+    # ===============
+
+    def _measure(self):
+        return list()
+
+    def _unit_set(self, unit):
+        return str()
+
+    def _unit_check(self):
+        return str()
+
+    def _model_check(self):
+        return str()
+
+
+
+# ====================
+# Dummy Server/Client
+# ====================
+dummy_api = {'measure': 'dummy_vm:measure',
+             'unit_set': 'dummy_vm:unit_set',
+             'unit_check': 'dummy_vm:unit_check'}
+
+# dummy client
+# ============
+class dummy_client(vacuummonitor):
+
+
+    def __init__(self, com):
+        self.server = dummy_server(com.port)
+        time.sleep(0.05)
+        vacuummonitor.__init__(self, com)
+        pass
+
+    def server_stop(self):
+        self.com.open()
+        self.com.send('stop\n')
+        self.com.close()
+        return
+
+    def _measure(self):
+        self.com.open()
+        self.com.send('%s\n'%(dummy_api['measure']))
+        ret = self.com.readline().strip().split(',')
+        press = [ret[1], ret[3]]
+        self.com.close()
+        return press
+
+    def _unit_set(self, unit):
+        self.com.open()
+        self.com.send('%s %s\n'%(dummy_api['unit_set'], unit))
+        self.unit =str(self.com.readline().strip())
+        self.com.close()
+        return self.unit
+
+    def _unit_check(self):
+        self.com.open()
+        self.com.send('%s\n'%(dummy_api['unit_check']))
+        self.com.close()
+        return self.unit
+
+    def _model_check(self):
+        return 'VacuumMonitor_Dummy'
+
+
+
+# dummy server
+# ============
+class dummy_server(object):
+    press1 = 0
+    press2 = 0
+    status1 = 0
+    status2 = 0
+    unit = 'None'
+
+    def __init__(self, port):
+        self.port = port
+        self.start()
+        pass
+
+    def start(self):
+        threading.Thread(target=self._start).start()
+        return
+
+    def _start(self):
+        server = socket.socket()
+        server.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        server.bind(('127.0.0.1', self.port))
+        server.listen(1)
+
+
+
+        while True:
+            client, client_address = server.accept()
+            self.client = client
+
+            while True:
+                data = client.recv(8192)
+                if len(data)==0: break
+                if data=='stop\n': return
+                command =data.strip().split(' ')[0]
+                params = data.strip().split(' ')[1:]
+                self.handle(command, params)
+                continue
+
+            client.close()
+            continue
+        return
+
+    def handle(self, command, params):
+        if command==dummy_api['measure']: self.measure(params)
+        elif command==dummy_api['unit_check']: self.unit_check(params)
+        elif command==dummy_api['unit_set']: self.unit_set(params)
+        else: print(command, params)
+        return
+
+    def measure(self, params):
+        self.client.send('%s,%.10f,%s,%.10f\n'%(self.status1, self.press1, self.status2, self.press2))
+        return
+
+    def unit_check(self, params):
+        return
+
+    def unit_set(self, params):
+        self.client.send('%s\n'%(params[0].lower()))
+        return
+
+
+
+
+
+
+
diff --git a/test/test_devices.py b/test/test_devices.py
index c7fed00..4e86656 100644
--- a/test/test_devices.py
+++ b/test/test_devices.py
@@ -30,4 +30,12 @@ def port_generate(index):
 sa.self_test(0.05)
 sa.server_stop()
 
+# vacuummonitor
+# ==========
+com_vm = pymeasure.socket_communicator('127.0.0.1', port_generate(3))
+vm = pymeasure.vacuummonitor.dummy(com_vm)
+vm.self_test(0.05)
+vm.server_stop()
+
+