Improved support for capturing ml-config using --ml-config (#8)