Merge "Fixed incorrect help message, converted to more standard format."