Merge branch 'release' of github.com:dimitriv/Ziria into bug-correction
Merge branch 'bug-correction' of github.com:dimitriv/Ziria into bug-correction
Merge branch 'bug-correction' of github.com:dimitriv/Ziria into bug-correction