Add fig.yml support
Merge branch 'master' into add_fig_support