Better handling of multiple files and report cleanup
Merge branch 'release/0.1.4'