Merge branch 'master' of github.com:epichub/neatzsche
Merge branch 'master' of github.com:epichub/neatzsche
merge with upstream
some fixes