add fixZ
fix D-E-F
Merge branch 'master' into supo

Conflicts:
	README.md
2nd