diff --git a/HTML5Application/public_html/admin/index.html b/HTML5Application/public_html/admin/index.html
index 5f21486..de5af71 100644
--- a/HTML5Application/public_html/admin/index.html
+++ b/HTML5Application/public_html/admin/index.html
@@ -2,34 +2,43 @@
 <html>
 <head>
     <title>Droid admin</title>
-    <meta charset="utf-8" />
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+    <!--<meta http-equiv="Content-Type" content="text/html;charset=windows-1251"/>-->
     <style type="text/css">
-        #tele {
-            width: 60px;
-            border: 1px solid red;
+        * {
+            font-family: Verdana;
         }
     </style>
-    <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
     <script type="text/javascript">
-        window.onload = function() {
+        window.onload = function () {
             var source = new EventSource('/dron/state');
-            source.addEventListener('message', function(event) {
-                var s = '',
-                    d = new Date;
+            source.addEventListener('message', function (event) {
+                var s = '', d = new Date;
+                var data = JSON.parse(event.data);
                 if (event.data) {
                     s += '<table>';
                     s += '<tr>';
+                    s += '<td>State:</td>';
+                    s += '<td>' + data.readystate + '</td>';
+                    s += '</tr>';
+                    s += '<tr>';
                     s += '<td>Timestamp:</td>';
                     s += '<td>' + (d + '.' + d.getMilliseconds()) + '</td>';
                     s += '</tr>';
-                    for (var i in event.data) {
-                       s += '<tr>';
-                       s += '<td>' + i + ':</td>';
-                       s += '<td>' + event.data[i] + '</td>';
-                       s += '</tr>';
+                    for (var i in data.demo) {
+                        s += '<tr>';
+                        s += '<td>Drone.' + i + ':</td>';
+                        s += '<td>' + data.demo[i] + '</td>';
+                        s += '</tr>';
+                    }
+
+                    for (var i = 0, n = data.qrcodes.length; i < n; ++i) {
+                        s += '<tr>';
+                        s += '<td>QR-code ' + (i + 1) + '</td>';
+                        s += '<td>' + data.qrcodes[i] + '</td>';
+                        s += '</tr>';
                     }
+
                     s += '</table>';
                 }
                 document.getElementById('tele').innerHTML = s;
diff --git a/HTML5Application/public_html/index.html b/HTML5Application/public_html/index.html
index 68b4760..0633f30 100644
--- a/HTML5Application/public_html/index.html
+++ b/HTML5Application/public_html/index.html
@@ -7,8 +7,8 @@
 <!DOCTYPE html> 
 <html> 
     <head>
-        <title>Droid</title> 
-        <meta charset="utf-8" />
+        <title>Droid</title>
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
         <meta name="apple-mobile-web-app-capable" content="yes" />
         <meta name="apple-mobile-web-app-status-bar-style" content="black" />
diff --git a/HTML5Application/public_html/js/application.js b/HTML5Application/public_html/js/application.js
index c5f1c01..6cef8ba 100644
--- a/HTML5Application/public_html/js/application.js
+++ b/HTML5Application/public_html/js/application.js
@@ -569,6 +569,7 @@
         _onImgChanged: function (_sImage) {
             if (this._canvas) {
                 this._canvas.setBackgroundImage(_sImage);
+				        this._canvas.renderAll();
             }
         },
                 
diff --git a/NodejsServer/ardrone.js b/NodejsServer/ardrone.js
index 1be6f76..17faf44 100644
--- a/NodejsServer/ardrone.js
+++ b/NodejsServer/ardrone.js
@@ -1,21 +1,29 @@
-var http    = require('http'),
+var http = require('http'),
     express = require('express'),
-    qrcode  = require('./qrcode'),
-    drone   = require('./drone').drone,
+    qrcode = require('./qrcode'),
+    drone = require(!process.env["drone_fake"] ? './drone' : './fakedrone').drone,
     app = express();
-var _DRONE_IP_ADDRESS = '192.168.1.1';
+
+
+drone.options = {
+  'general:navdata_demo': 'FALSE',
+  'video:video_channel': parseInt(process.env["drone_video_channel"]) || null
+};
+
+drone.features = {
+  'motion-filter': process.env["drone_motion_filter"] ? true : false,
+  'motion-smooth': process.env["drone_motion_smooth"] ? true : false,
+  'motion-smooth-factor': parseInt(process.env["drone_motion_smooth_factor"]) || 10
+};
+
 
 // Configuration
-app.configure(function(){
+app.configure(function () {
   app.use(express.logger('dev'));
   app.use(express.bodyParser());
   app.use(express.static('./project/HTML5Application/public_html'));
 });
 
-var oCurrentState = {
-  'qrcodes' : [],
-  'recognitionStatus' : 0
-};
 
 function getDrone(_stream) {
   var droneClient = drone.get();
@@ -32,18 +40,27 @@ function getDrone(_stream) {
   return droneClient;
 }
 
+function sendEvent(_stream, _drone) {
+  _stream.write('data:' + JSON.stringify({
+    'readystate': (_drone.navdata && _drone.navdata.droneState ) ? _drone.navdata.droneState.flying == 1 ? 'flying' : 'landed' : 'uninited',
+    'img': _drone.lastImage && 'data:image/png;base64,' + _drone.lastImage.toString('base64')
+  }) + '\n\n');
+}
+
+
 function sendState(_stream, _drone) {
   _stream.write('data:' + JSON.stringify({
-    'readystate'  : _drone.navdata ? _drone.navdata.droneState.flying == 1 ? 'flying' : 'landed' : 'uninited',
-    'img' : _drone.lastImage && 'data:image/png;base64,' + _drone.lastImage.toString('base64')
-  }) +   '\n\n');
+    'readystate': (_drone.navdata && _drone.navdata.droneState) ? _drone.navdata.droneState.flying == 1 ? 'flying' : 'landed' : 'uninited',
+    'demo': _drone.navdata && _drone.navdata.demo,
+    'qrcodes': _drone.qrcodes || []
+  }) + '\n\n');
 }
 
+
 // Sends drone state & image
-app.get('/dron/events', function(request, response){
-  var droneClient = getDrone(response, true);
+function onEvents(request, response) {
+  var droneClient = getDrone(response);
   if (!droneClient) {
-    sendState(response, {'lastImage':''});
     return;
   }
   // Push data through socket
@@ -54,8 +71,9 @@ app.get('/dron/events', function(request, response){
     'Connection': 'keep-alive'
   });
   response.write('\n');
+
   // Handle connection interrupt
-  request.on("close", function() {
+  request.on("close", function () {
     var droneClient = getDrone(response);
     if (droneClient) {
       droneClient.stop();
@@ -64,67 +82,61 @@ app.get('/dron/events', function(request, response){
   });
 
   var prevState = null;
-  droneClient.listener.on('state', function(_DroneObject) {
-    if (prevState != _DroneObject.navdata.droneState.flying) {
-      sendState(response, _DroneObject);
+  droneClient.listener.on('state', function (_DroneObject) {
+    if (_DroneObject.navdata.droneState) {
+      if (prevState != _DroneObject.navdata.droneState.flying) {
+        sendEvent(response, _DroneObject);
+      }
+      prevState = _DroneObject.navdata.droneState.flying;
     }
-    prevState = _DroneObject.navdata.droneState.flying
   });
 
-  droneClient.listener.on('image', function(_DroneObject) {
-    sendState(response, _DroneObject);
+  droneClient.listener.on('image', function (_DroneObject) {
+    sendEvent(response, _DroneObject);
   });
+}
 
 
-  // Subscribe to recieve telemetrics
-//  droneClient.on('navdata', function(navdata) {
-//    if (navdata.droneState && navdata.demo) {
-//      var bStateChanged = oCurrentState.droneState != navdata.droneState;
-//      oCurrentState.droneState  = navdata.droneState;
-//      oCurrentState.droneDemo   = navdata.demo;
-//      // Sends update to client only if drone state has been changed
-//      if (bStateChanged) {
-//        response.write('data:' + JSON.stringify({
-//          'readystate'  : oCurrentState.droneState ? oCurrentState.droneState.flying == 1 ? 'flying' : 'landed' : 'uninited',
-//          'img'         : oCurrentState.img
-//        }) +   '\n\n');
-//      }
-//    }
-//  });
-
-  // Create PNG stream and subscribe for it's data
-/*
-  var pngStream = droneClient.createPngStream();
-  pngStream.on('data', function(pngImage) {
-    console.log('ondata');
-    var img = 'data:image/png;base64,' + (new Buffer(pngImage, 'binary').toString('base64'));
-    if (img != oCurrentState.img) {
-      oCurrentState.img = img;
-      response.write('data:' + JSON.stringify({
-        'readystate'  : oCurrentState.droneState ? oCurrentState.droneState.flying == 1 ? 'flying' : 'landed' : 'uninited',
-        'img'         : oCurrentState.img
-      }) +   '\n\n');
-      if (!oCurrentState.recognitionStatus) {
-        oCurrentState.recognitionStatus = 1;
-        qrcode.recognize(img, function(sText){
-          oCurrentState.recognitionStatus = 0;
-          if (sText) {
-            oCurrentState.qrcodes.push(sText);
-          }
-        });
-      }
+function onState(request, response) {
+  var droneClient = getDrone(response);
+  if (!droneClient) {
+    return;
+  }
+  // Push data through socket
+  request.socket.setTimeout(Infinity);
+  response.writeHead(200, {
+    'Content-Type': 'text/event-stream',
+    'Cache-Control': 'no-cache',
+    'Connection': 'keep-alive'
+  });
+  response.write('\n');
+
+  // Handle connection interrupt
+  request.on("close", function () {
+    var droneClient = getDrone(response);
+    if (droneClient) {
+      droneClient.stop();
     }
+    response.end();
+  });
+
+  droneClient.listener.on('state', function (_DroneObject) {
+    sendState(response, _DroneObject);
   });
-*/
-});
+
+  droneClient.listener.on('qrcodes', function (_DroneObject) {
+    sendState(response, _DroneObject);
+  });
+}
+
 
 // Take the dron off
-function onTakeoff (request, response) {
+function onTakeoff(request, response) {
   var droneClient = getDrone(response);
   if (!droneClient) {
     return;
   }
-  droneClient.takeoff(function(){
+  droneClient.takeoff(function () {
     response.writeHead(200, {
       'Content-Type': 'text/plain',
       'Cache-Control': 'no-cache',
@@ -134,11 +146,10 @@ function onTakeoff (request, response) {
     response.end();
   });
 }
-app.get('/dron/takeoff', onTakeoff);
-app.post('/dron/takeoff', onTakeoff);
+
 
 // Makes the drom land
-function onLand (request, response) {
+function onLand(request, response) {
   var droneClient = getDrone(response);
   if (!droneClient) {
     return;
@@ -152,11 +163,9 @@ function onLand (request, response) {
   response.write('\n1');
   response.end();
 }
-app.get('/dron/land', onLand);
-app.post('/dron/land', onLand);
 
-// Makes the dron move
-app.post('/dron/move', function(request, response) {
+
+function onMove(request, response) {
   if (request.body) {
     var droneClient = getDrone(response);
     if (!droneClient) {
@@ -174,55 +183,29 @@ app.post('/dron/move', function(request, response) {
     response.write('\n0');
   }
   response.end();
-});
+}
 
-// Sends drone's full state
-app.get('/dron/state', function(request, response){
-  var droneClient = getDrone(response);
-  if (!droneClient) {
-    return;
-  }
 
-  // Push data through socket
-  request.socket.setTimeout(Infinity);
+// Sends drone state & image
+app.get('/dron/events', onEvents);
 
-  response.writeHead(200, {
-    'Content-Type': 'text/event-stream',
-    'Cache-Control': 'no-cache',
-    'Connection': 'keep-alive'
-  });
-  response.write('\n');
+// Takeoff drone
+app.get('/dron/takeoff', onTakeoff);
+app.post('/dron/takeoff', onTakeoff);
+
+// Land drone
+app.get('/dron/land', onLand);
+app.post('/dron/land', onLand);
 
-  // Push telemetrics data via interval
-  var intervalId = setInterval(function() {
-    response.write('data:' + JSON.stringify({
-      'readystate'  : oCurrentState.droneState ? oCurrentState.droneState.flying == 1 ? 'flying' : 'landed' : 'unknown',
-      'data'        : oCurrentState.droneDemo,
-      'qrcodes'     : oCurrentState.qrcodes
-    }) +   '\n\n');  }, 100);
+// Makes the drone move
+app.post('/dron/move', onMove);
 
-  // Handle connection interrupt
-  request.on("close", function() {
-    clearInterval(intervalId);
-    response.end();
-  });
-});
+// Sends drone's full state
+app.get('/dron/state', onState);
 
 app.listen(1337, '0.0.0.0');
+
 console.log('Server running at http://127.0.0.1:1337/');
 
-/*
-response.writeHead(200, {'Content-Type': 'text/plain'});
-//  var qrdecoder = require('node-zxing')({'ZXingLocation':'./node_modules/node-zxing/lib/'});
-//  var path = "./sample.jpg";
-//  qrdecoder.decode(path,
-//      function(err, out) {
-//        res.end(out + '\n');
-//        console.log(err,out);
-//      }
-//  );
-
-var client  = require('ar-drone').createClient({'ip':'127.0.0.1'});
-client.up(0.5);
-//  client.front(1);
-*/
+
+
diff --git a/NodejsServer/drone/index.js b/NodejsServer/drone/index.js
index b56b2a1..93020ae 100644
--- a/NodejsServer/drone/index.js
+++ b/NodejsServer/drone/index.js
@@ -1,38 +1,69 @@
 var droneApi = require('ar-drone');
 var events = require('events');
-var rqcodes = require('../qrcode');
+var fs = require('fs');
+var qr = require('../qrcode');
 
-function drone(_client) {
+
+function drone(_client, _stream) {
   this.name = "drone";
   this.client = _client;
-  this.stream = null;
-  this.listener = null;
+  this.stream = _stream;
+  this.listener = new events.EventEmitter();
+  this.last_motion = {};
 
   this.navdata = {};
 
-  this.lastIimage = null;
-  this.rqcodes = [];
+  this.lastImage = null;
+  this.recognizingImages = 0;
+
+  this.qrcodes = [];
   this.error = "";
 }
 
+
+drone.instance = null;
+drone.options = {};
+drone.features = {};
+drone.error = null;
+
+
 drone.prototype.updateState = function (_navdata) {
-  if (_navdata.droneState && _navdata.demo)  {
+  if (_navdata.droneState && _navdata.demo) {
     this.navdata = _navdata;
   }
 }
 
 
 drone.prototype.updateImage = function (_image) {
-  this.lastIimage = _image;
+  var self = this;
+  self.lastImage = _image;
+
+  if (self.recognizingImages < 10) {
+    ++self.recognizingImages;
+    qr.recognize(_image, function (_text, _error) {
+      --self.recognizingImages
+      if (_text) {
+        self.updateQrcode(_text);
+        self.pushQrcodes();
+      }
+    });
+  }
 }
 
 
 drone.prototype.updateQrcode = function (_text) {
-  this.qrcodes.push(_text);
+  var i = 0, n = this.qrcodes.length;
+  for (; i < n; ++i) {
+    if (this.qrcodes[i] === _text) {
+      break;
+    }
+  }
+  if (i == n) {
+    this.qrcodes.push(_text);
+  }
 }
 
 
-
 drone.prototype.pushReady = function () {
   var self = this;
   if (self.listener) {
@@ -49,7 +80,7 @@ drone.prototype.pushState = function () {
 }
 
 
-drone.prototype.pushImage = function() {
+drone.prototype.pushImage = function () {
   var self = this;
   if (self.listener) {
     self.listener.emit('image', self);
@@ -57,7 +88,6 @@ drone.prototype.pushImage = function() {
 }
 
 
-
 drone.prototype.pushQrcodes = function () {
   var self = this;
   if (self.listener) {
@@ -66,65 +96,54 @@ drone.prototype.pushQrcodes = function () {
 }
 
 
+drone.prototype.isMotionFiltered = function (_command, _value) {
+  if (!drone.features["motion-filter"]) {
+    return false;
+  }
 
-
-
-
-
-drone.prototype.open = function() {
-  this.error = null;
-
-  if (this.listener)  	{
-    this.error = "Dron is busy";
-    return null;
+  if (this.last_motion[_command] !== _value) {
+    return false;
   }
 
-  this.listener = new events.EventEmitter();
-  return this.listener
+  return true;
 }
 
 
-drone.prototype.close = function() {
-  if (!this.listener)  	{
-    this.error = "Not ready";
-    return false;
+drone.prototype.smoothMotion = function (_value) {
+  if (!drone.features["motion-smooth"]) {
+    return _value;
   }
-
-  this.listener.removeAllListeners();
-  this.listener = null;
-  return true;
+  var factor = drone.features["motion-smooth-factor"] || 10;
+  if (factor < 5) {
+    factor = 5;
+  }
+  if (factor > 100) {
+    factor = 100;
+  }
+  return Math.round(_value * factor) / factor;
 }
 
 
-drone.prototype.ready = function () {
+drone.prototype.prepare = function () {
   var self = this;
 
-//  console.log("ready");
-
   self.pushReady();
 
-  self.client.on('navdata', function(_navdata) {
-//    console.log('navdata');
-    self.updateState(_navdata);
-    self.pushState();
-  });
-
-  console.log(selt.client._png);
-  self.stream = self.client.createPngStream();
-  console.log('png');
-//  self.stream.on('data', function(_image) {
-////    console.log('png');
-//
-//    rqcodes. (_image, function (_text,_error) {
-//      if (_text) {
-//        self.updateQrcode(_text);
-//        self.pushQrcode();
-//      }
-//    });
-//
-//    self.updateImage(_image);
-//    self.pushImage();
-//  });
+  if (self.client) {
+    self.client.on('navdata', function (_navdata) {
+      //    console.log('navdata');
+      self.updateState(_navdata);
+      self.pushState();
+    });
+  }
+
+  if (self.stream) {
+    self.stream.on('error', console.log);
+    self.stream.on('data', function (_image) {
+      self.updateImage(_image);
+      self.pushImage();
+    });
+  }
 }
 
 
@@ -147,61 +166,111 @@ drone.prototype.land = function () {
 
 drone.prototype.move = function (_commands) {
   var self = this;
-  console.log('move: ' + _commands)
-  if ('forwardbackward' in _commands) {
-    if (_commands['forwardbackward'] > 0) {
-      self.client.front(_commands['forwardbackward']);
+
+  var command;
+
+  console.log('move: %j', _commands);
+
+  command = 'forwardbackward';
+  if (command in _commands) {
+    var value = self.smoothMotion(_commands[command]);
+    if (!self.isMotionFiltered(command, value)) {
+      if (value >= 0) {
+        self.client.front(value);
+      } else {
+        self.client.back(-value);
+      }
+      console.log('Motion "%s" sended. Value: %s', command, value);
     } else {
-      self.client.back(_commands['forwardbackward']);
+      console.log('Motion "%s" filtered. Value: %s', command, value);
     }
+    self.last_motion[command] = value;
   }
-  if ('leftright' in _commands) {
-    if (_commands['leftright'] > 0) {
-      self.client.right(_commands['leftright']);
+
+  command = 'leftright';
+  if (command in _commands) {
+    var value = self.smoothMotion(_commands[command]);
+    if (!self.isMotionFiltered(command, value)) {
+      if (value >= 0) {
+        self.client.right(value);
+      } else {
+        self.client.left(-value);
+      }
+      console.log('Motion "%s" sended. Value: %s', command, value);
     } else {
-      self.client.left(_commands['leftright']);
+      console.log('Motion "%s" filtered. Value: %s', command, value);
     }
+    self.last_motion[command] = value;
   }
-  if ('updown' in _commands) {
-    if (_commands['updown'] > 0) {
-      self.client.up(_commands['updown']);
+
+  command = 'updown';
+  if (command in _commands) {
+    var value = self.smoothMotion(_commands[command]);
+    if (!self.isMotionFiltered(command, value)) {
+      if (value >= 0) {
+        self.client.up(value);
+      } else {
+        self.client.down(-value);
+      }
+      console.log('Motion "%s" sended. Value: %s', command, value);
     } else {
-      self.client.down(_commands['updown']);
+      console.log('Motion "%s" filtered. Value: %s', command, value);
     }
+    self.last_motion[command] = value;
   }
-  if ('rotate' in _commands) {
-    if (_commands['rotate'] > 0) {
-      self.client.clockwise(_commands['rotate']);
+
+  command = 'rotate';
+  if (command in _commands) {
+    var value = self.smoothMotion(_commands[command]);
+    if (!self.isMotionFiltered(command, value)) {
+      if (value >= 0) {
+        self.client.clockwise(value);
+      } else {
+        self.client.counterClockwise(-value);
+      }
+      console.log('Motion "%s" sended. Value: %s', command, value);
     } else {
-      self.client.counterClockwise(_commands['rotate']);
+      console.log('Motion "%s" filtered. Value: %s', command, value);
     }
+    self.last_motion[command] = value;
   }
 }
 
 
+drone.get = function () {
+  drone.error = null;
 
+  if (!drone.instance) {
+    var client, stream;
+    try {
+      client = droneApi.createClient();
+    } catch (e) {
+      console.error('Create client: ' + e.message);
+      drone.error = e.message;
+    }
 
+    if (client && drone.options) {
+      for (var k in drone.options) {
+        if (drone.options[k]) {
+          console.log("Set config: %j: %j", k, drone.options[k])
+          client.config(k, drone.options[k]);
+        }
+      }
+    }
 
-drone.instance =null;
-drone.error = null;
-
-
-
-drone.get = function() {
-  drone.error = null;
-  if (!drone.instance)	{
+    console.log("Features: %j", drone.features);
     try {
-      var client = droneApi.createClient();
-      client.config('general:navdata_demo', 'FALSE');
-      client.config('video:video_channel',  3);
-      drone.instance = new drone(client);
-      drone.instance.open();
-      drone.instance.ready();
+      stream = client && client.createPngStream();
     } catch (e) {
+      console.error('Create stream: ' + e.message);
       drone.error = e.message;
     }
+
+    drone.instance = client ? new drone(client, stream) : null;
+    drone.instance.prepare();
   }
   return drone.instance;
 }
 
+
 exports.drone = drone;
diff --git a/NodejsServer/fakedrone/index.js b/NodejsServer/fakedrone/index.js
new file mode 100644
index 0000000..db39a88
--- /dev/null
+++ b/NodejsServer/fakedrone/index.js
@@ -0,0 +1,177 @@
+var events = require('events');
+var fs = require('fs');
+var qr = require('../qrcode');
+
+
+function drone(_client) {
+	this.navdata = {
+		droneState: {flying: 0},
+		droneDemo: {"accel" : 1, "batery: ": 14}};
+	this.listener = new events.EventEmitter();
+	
+	this.lastImage = null;
+	this.recognizingImages = 0;
+
+	  
+	this.qrcodes = [];
+	this.error = "";
+}
+
+
+drone.prototype.updateImage = function (_image) {
+  var self = this;
+  self.lastImage = _image;
+  
+  if (self.recognizingImages < 10) {
+	  ++self.recognizingImages;
+	  qr.recognize(_image, function (_text,_error) {
+		--self.recognizingImages
+    	if (_text) {
+			self.updateQrcode(_text);
+			self.pushQrcodes();
+	    }
+	  });
+	}
+}
+
+
+drone.prototype.updateQrcode = function (_text) {
+	var i = 0, n = this.qrcodes.length;
+	for (; i < n; ++i) {
+		if (this.qrcodes[i] === _text) break;
+	}
+	if (i == n) this.qrcodes.push(_text);
+}
+
+
+
+drone.prototype.pushReady = function () {
+	//console.log("drone::pushReady. %j", this);
+	if (this.listener) {
+		this.listener.emit('ready',  this);
+	}
+}
+
+
+drone.prototype.pushState = function () {
+	//console.log("drone::pushState. %j", this);
+	if (this.listener) {
+		this.listener.emit('state', this);
+	}
+}
+
+
+drone.prototype.pushImage = function() {
+	//console.log("drone::pushImage. %j", this);
+	if (this.listener) {
+		this.listener.emit('image', this);
+	}
+}
+
+
+
+drone.prototype.pushQrcodes = function () {
+	//console.log("drone::pushQrcodes. %j", this);
+	if (this.listener) {
+		this.listener.emit('qrcodes', this);
+	}
+}
+
+
+
+
+drone.prototype.takeoff = function (_callback) {
+	//console.log('drone::takeoff');
+	
+	this.navdata.droneState.flying = true;
+	this.pushState();
+	_callback && _callback();
+	
+}
+
+
+drone.prototype.land = function () {
+	//console.log('drone::land');
+	this.navdata.droneState.flying = false;
+	this.pushState();
+}
+
+
+drone.prototype.move = function (_command) {
+	console.log('drone::move(%j)', _command);
+}
+
+drone.prototype.stop = function () {
+	console.log('drone::stop()');
+}
+
+
+
+drone.instance = null;
+drone.error = null;
+
+function emuState() {
+	//console.log("emuState: %j", drone.instance);
+	setTimeout(function () {
+		if (drone.instance) {
+			drone.instance.pushState();
+		}
+		emuState();
+	}, 500);
+
+}
+
+
+function emuImage() {
+	//console.log("emuImage: %j", drone.instance);
+	setTimeout(function () {
+		
+		if (drone.instance) {
+			var sample = __dirname + '/sample.png';
+			if (fs.existsSync(sample)) {
+				drone.instance.updateImage(fs.readFileSync(sample));
+				drone.instance.pushImage();
+			}
+		}
+		
+		emuImage();
+	}, 700);
+}
+
+var ii = 0;
+function emuQrcodes() {
+	//console.log("emuImage: %j", drone.instance);
+	setTimeout(function () {
+		
+		if (drone.instance) {
+			drone.instance.updateQrcode('Test ' + ii % 10);
+			drone.instance.pushQrcodes();
+			++ii;
+		}
+		emuQrcodes();
+	}, 1500);
+}
+
+
+
+
+drone.get = function(_ip) {
+	drone.error = null;
+	if (!drone.instance)	{
+		try {
+			drone.instance = new drone();
+			
+			emuState();
+			emuImage();
+			emuQrcodes();
+			
+		}
+		catch (e) {
+			drone.error = e.message;
+		}
+	}
+	return drone.instance;
+}
+
+
+exports.drone = drone;
diff --git a/NodejsServer/fakedrone/sample.png b/NodejsServer/fakedrone/sample.png
new file mode 100644
index 0000000..6157d46
Binary files /dev/null and b/NodejsServer/fakedrone/sample.png differ
diff --git a/NodejsServer/qrcode/index.js b/NodejsServer/qrcode/index.js
index b2ffdfd..0fdb220 100644
--- a/NodejsServer/qrcode/index.js
+++ b/NodejsServer/qrcode/index.js
@@ -1,14 +1,58 @@
-var zxing = require('node-zxing')({ZXingLocation: __dirname + "/lib/zxing-2.2"});
 var fs = require('fs');
 var path = require('path');
+var exec = require('child_process').exec;
+
+
+function makeZxing(options) {
+  var defaults = options || {};
+
+  if(defaults.ZXingLocation == null) {
+    defaults.ZXingLocation = "";
+  }
+
+  var commandLineOptions = " ";
+  if(defaults.try_harder) {
+    commandLineOptions += "--try_harder ";
+  }
+  return {
+    decode: function(_path, _cb) {
+		var cmdline = 'java -cp '+defaults.ZXingLocation+path.sep+'javase.jar'+path.delimiter+defaults.ZXingLocation+path.sep+'core.jar com.google.zxing.client.j2se.CommandLineRunner'+commandLineOptions+''+_path;
+		//console.log(cmdline);
+        exec(cmdline, 
+        function(err, stdout, stderr){
+          var qrcode = "";
+          var errorCache = null;
+          //console.log(err, stdout, stderr);
+          if(err !== null) {
+            //console.log(err, stdout, stderr);
+            errorCache = err;
+          } else {
+            var lines = stdout.split("\n");
+
+            for(var i in lines) {
+              if(lines[i] == 'Raw result:') {
+                qrcode = lines[parseInt(i)+1];
+                break;
+              }
+            }
+            
+          }
+          _cb(errorCache, qrcode);
+        }
+      );
+    }
+  };
+}
+
 
 var tempIndex = 0;
+var zxing = makeZxing({ZXingLocation: __dirname + "/lib/zxing-2.2"});
 
 
 exports.recognize = function (_image, _callback, _ext) {
 	tempIndex++;
 	
-	var fname = 'image' + tempIndex.toString() + "." + _ext || '.svg';
+	var fname = 'image' + tempIndex.toString() + "." + (_ext || 'png');
 	var tpath = path.join(__dirname, 'temp');
 	var fpath = path.join(tpath, fname);
 	
@@ -16,7 +60,7 @@ exports.recognize = function (_image, _callback, _ext) {
 	if (fs.existsSync()) fs.unlinkSync(fpath);
 	
 	fs.writeFileSync(fpath, _image);
-	
+
 	zxing.decode(fpath, function (_error, _text) {
 		fs.unlinkSync(fpath);
 
