Merge branch 'master' of https://github.com/Navedac/Ziboologic.git