a couple of fixes, now should be ready for a trial run
Merge branch 'master' of github.com:d-vova/vs-service