Merge "Fixed atexit()"