Implemented the ANSI ez feature
Merge branch 'feature-ansi-ez' into dev