A few security fixes here and there
Merge branch 'master' of github.com:ekowabaka/kakalika