Z matrix edit
Merge branch 'master' of github.com:iamamutt/mejr