diff --git a/monitor.py b/monitor.py
index b8d5010..207e849 100755
--- a/monitor.py
+++ b/monitor.py
@@ -23,6 +23,7 @@
 from socket import *
 
 from sensors.cpu import *
+from sensors.memory import *
 
 HOST = ''
 PORT = 6000
@@ -35,6 +36,7 @@ class Stats:
 	def __init__(self):
 		self.sensors = []
 		self.sensors.append(cpu_monitor())
+		self.sensors.append(mem_monitor())
 
 	def getStats(self):
 		message = ''
diff --git a/sensors/.cpu.py.swp b/sensors/.cpu.py.swp
new file mode 100644
index 0000000..dac057d
Binary files /dev/null and b/sensors/.cpu.py.swp differ
diff --git a/sensors/.memory.py.swp b/sensors/.memory.py.swp
new file mode 100644
index 0000000..5b23281
Binary files /dev/null and b/sensors/.memory.py.swp differ
diff --git a/sensors/__init__.py b/sensors/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/sensors/__init__.pyc b/sensors/__init__.pyc
new file mode 100644
index 0000000..19e6705
Binary files /dev/null and b/sensors/__init__.pyc differ
diff --git a/sensors/cpu.py b/sensors/cpu.py
new file mode 100755
index 0000000..80cde81
--- /dev/null
+++ b/sensors/cpu.py
@@ -0,0 +1,20 @@
+#!/usr/bin/python
+
+import psutil
+
+class cpu_monitor:
+	def __init__(self):
+		self.num_cpus = len(psutil.cpu_percent(0,percpu=True))
+
+	def update(self):
+		self.cpu_usage = psutil.cpu_percent(0.1, percpu=True)
+		self.cpu_times = psutil.cpu_times()
+
+	def getFormatedData(self):
+		message = ''
+		message += 'Cpu usage: '
+		message += ', '.join('%.1f'%x for x in self.cpu_usage)
+		message += ' CPU times: '
+		message += ', '.join('%.3f'%x for x in self.cpu_times)
+		return message
+
diff --git a/sensors/cpu.pyc b/sensors/cpu.pyc
new file mode 100644
index 0000000..3c3c8a7
Binary files /dev/null and b/sensors/cpu.pyc differ
diff --git a/sensors/memory.py b/sensors/memory.py
new file mode 100644
index 0000000..e14d3ee
--- /dev/null
+++ b/sensors/memory.py
@@ -0,0 +1,18 @@
+#!/usr/bin/python
+
+import psutil
+
+class mem_monitor:
+	def __init__(self):
+		self.mem_usage = ''
+		self.virt_mem_usage = ''
+
+	def update(self):
+		self.mem_usage = psutil.phymem_usage()
+		self.virt_mem_usage = psutil.virtmem_usage()
+
+	def getFormatedData(self):
+		message = 'Memory- Phys: %.1f Virt: %.1f' % (self.mem_usage.percent, self.virt_mem_usage.percent)
+		return message
+
+
diff --git a/sensors/memory.pyc b/sensors/memory.pyc
new file mode 100644
index 0000000..2be5ad0
Binary files /dev/null and b/sensors/memory.pyc differ