Merge branch 'bug_178_update_meta_files'