Finished multifile feature;
Merge branch 'feature-multifile'