merging files in complicated cases (#92)
Merge branch 'master' of github.com:lomereiter/sambamba