Fix comment
Fix NPE
Merge branch 'develop' of github.com:jbruchanov/AnUitor into develop