Corrected help options
Merge branch 'mysql_integration'