Merge branch 'master' of http://github.com/ricardostange/Z-MAX
Merge branch 'master' of http://github.com/ricardostange/Z-MAX