Initial commit.
Add the exit test case (commented out).
Merge origin/master