oneservice fix
efefMerge remote-tracking branch 'origin/0.5' into 0.5
fewbugfixes
Merge pull request #157 from morpheyesh/0.5

0.5 - oneservice not fixed yet!