security enhancement
Merge branch 'master' of github.com:veith/zuizz