better logging
Merge branch 'master' of github.com:mastoj/NirvanaService