improve logging
improve logging & minor refactor
Merge pull request #2 from piskvorky/ziky90-develop

Ziky90 develop