Merging with MAC
Merge branch 'mac' of github.com:dimitriv/Ziria into mac