Merge "Add using dash options instead of underscore"