Merge "Correct return code from main"