fix issue with multiple files
Merge branch 'release/v0.1.5'