fixed issues
Merge 00branch 'master' of https://github.com/thesevenlayers/zaghruta

oo