diff --git a/.gitignore b/.gitignore
index 72364f9..827de0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+#docker-compose file, because it contains passwords
+docker-compose.yaml
+docker-compose.yml
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..2ed75ff
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,12 @@
+FROM jfloff/alpine-python:3.4
+
+ENV LIBRARY_PATH=/lib:/usr/lib
+
+ADD src/requirements.txt /
+RUN pip install --upgrade pip && pip install -r /requirements.txt
+
+WORKDIR /app
+COPY src /app
+
+EXPOSE 5000
+CMD ["python", "-u", "/app/main.py"]
diff --git a/src/main.py b/src/main.py
new file mode 100644
index 0000000..e273d57
--- /dev/null
+++ b/src/main.py
@@ -0,0 +1,171 @@
+import pyyeelight
+import paho.mqtt.client as mqtt
+import os
+import time
+import threading
+
+class LightBulbState:
+	bright = 0
+	color_temperature = 0
+	status = "off"
+	rgb = 0
+	
+	ip = ""
+	name = ""
+	yeelight = None # yeelight object
+
+	def __init__(self, ip, yeelightObj):
+		self.yeelight = yeelightObj
+		self.name = yeelightObj.__name__
+		self.ip = ip
+
+	def update_properties(self, force = False):
+		if (force):
+			self.yeelight.refresh_property()
+		prop = self.yeelight.get_all_properties()
+		# print(prop)
+		self.bright = prop["bright"]
+		self.color_temperature = prop["ct"]
+		self.status = prop["power"]
+		self.rgb = prop["rgb"]
+
+	def hash(self):
+		return str(self.bright) + ":" + str(self.color_temperature) + ":" + str(self.status) + ":" + str(self.rgb)
+	
+	def is_int(self, x):
+		try:
+			tmp = int(x)
+			return True
+		except Exception as e:
+			return False
+
+	def process_command(self, param, value):
+		try:
+			if (param == 'status'):
+				if (value == "on"):
+					print("Turning on bulb", self.name)
+					self.yeelight.turn_on()
+				if (value == "off"):
+					print("Turning off bulb", self.name)
+					self.yeelight.turn_off()
+			if (param == 'bright' and self.is_int(value)):
+				print("Setting brightness of bulb", self.name, 'to', value)
+				self.yeelight.set_brightness(int(value))
+			if (param == 'ct' and self.is_int(value)):
+				print("Setting temperature of bulb", self.name, 'to', value)
+				self.yeelight.set_color_temperature(int(value))
+			if (param == 'rgb' and self.is_int(value)):
+				intval = int(value)
+				Blue =  intval & 255
+				Green = (intval >> 8) & 255
+				Red =   (intval >> 16) & 255
+				print("Setting rgb of bulb", self.name, 'to', value)
+				self.yeelight.set_rgb_color(Red, Green, Blue)
+		except Exception as e:
+			print ('Error while set value of bulb', self.name , ' error:', e)
+
+MQTT_SERVER = os.getenv('MQTT_SERVER', "")
+MQTT_PORT = os.getenv('MQTT_PORT', 1883)
+MQTT_USER = os.getenv('MQTT_USER', "")
+MQTT_PASS = os.getenv('MQTT_PASS', "")
+QUERY_TIME = 3
+
+ips = dict({
+	'192.168.1.51':'main-mono',
+	'192.168.1.54':'main-color', 
+	'192.168.1.52':'kitchen', 
+	'192.168.1.53':'hall'
+})
+bulbs=[]
+processNow = False
+ 
+PATH_FMT = "xiaomi/{model}/{sid}/{prop}" # short_id or sid ?
+
+def prepare_mqtt():
+	print("Connecting to MQTT server", MQTT_SERVER, ":", MQTT_PORT, "with username", MQTT_USER,":",MQTT_PASS)
+	client = mqtt.Client()
+	if (MQTT_USER != "" and MQTT_PASS != ""):
+		client.username_pw_set(MQTT_USER, MQTT_PASS)
+	client.connect(MQTT_SERVER, MQTT_PORT, 60)
+ 
+	return client
+ 
+def push_data(client, model, sid, data):
+	for key, value in data.items():
+		path = PATH_FMT.format(model=model,
+							   sid=sid,
+							   prop=key)
+		client.publish(path, payload=value, qos=0, retain=True)
+
+def init_lamps():
+	lamps=[]
+	for ip in ips:
+		try:
+			yeelight = pyyeelight.YeelightBulb(ip)
+			yeelight.__name__ = ips[ip] #add name
+			bulb = LightBulbState(ip, yeelight)
+			bulb.update_properties()
+			lamps.append(bulb)
+		except Exception as e:
+			print('Connection to ', str(ip) , ' error:', str(e))
+	return lamps
+
+
+def refresh_bulb_states(data_callback):
+	for bulb in bulbs:
+		try:
+			hashold = bulb.hash()
+			bulb.update_properties(force=True)
+			hashnew = bulb.hash()
+			# print(str(bulb.name),hashold, hashnew)
+
+			if (hashold != hashnew):
+				print("!!!! ", bulb.name, ":", hashold, "->", hashnew)
+				if data_callback is not None:
+					data = {'status':bulb.status, 'ct':bulb.color_temperature, 'bright':bulb.bright, 'rgb':bulb.rgb}
+					data_callback("lamp", bulb.name, data)
+		except Exception as e:
+			print('Connection to ', str(bulb.name) , ' error:', str(e))
+
+def on_mqtt_message(client, userdata, msg):
+	global processNow
+	print(msg.topic+" "+str(msg.payload))
+	parts = msg.topic.split("/")
+	if (len(parts) != 5):
+		return
+	name = parts[2] #name part
+	param = parts[3] #param part
+	value = (msg.payload).decode('utf-8')
+
+	for bulb in bulbs:
+		if (bulb.name != name):
+			continue
+		bulb.process_command(param, value)
+		processNow=True
+
+def on_connect(client, userdata, rc):
+	client.subscribe("xiaomi/lamp/+/+/set")
+
+def refresh_loop(client):
+	global processNow
+	cb = lambda m, s, d: push_data(client, m, s, d)
+	while True:
+		refresh_bulb_states(cb)
+		for x in range(1,10):
+			if (processNow):
+				processNow=False
+				break
+			time.sleep(QUERY_TIME/10)
+
+if __name__ == "__main__":
+	client = prepare_mqtt()
+	bulbs = init_lamps()
+	client.on_message = on_mqtt_message
+	client.on_connect = on_connect
+
+	#start thread for lamp refresh loop
+	t1 = threading.Thread(target=refresh_loop, args=[client])
+	t1.start()
+
+    # and process mqtt messages in this thread
+	client.loop_forever()
\ No newline at end of file
diff --git a/src/requirements.txt b/src/requirements.txt
new file mode 100644
index 0000000..2c82f62
--- /dev/null
+++ b/src/requirements.txt
@@ -0,0 +1,2 @@
+paho-mqtt
+pyyeelight==1.0-beta
\ No newline at end of file