Bugfixes and added z data output
Merge branch 'master' of github.com:jamesr66a/dont-fuck-this-one-up