ANSI
Merge pull request #1379 from chriscct7/release/1.7

ANSI