Fix errors
Merge branch 'master' of https://github.com/bserdar/lightblue
Pulling changes from origin/master
Some fixes