fixing issue #2
restart to ubuntu
adding feature ref #3
restart to ubuntu
Merge branch 'master' into devel

* master:
  adding feature ref #3
  restart to ubuntu
  fixing issue #2