added possibility to disable the underscore convention